summaryrefslogtreecommitdiffstats
path: root/c/src/ada-tests/sptests/sp22/sptest.adb
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/ada-tests/sptests/sp22/sptest.adb')
-rw-r--r--c/src/ada-tests/sptests/sp22/sptest.adb64
1 files changed, 31 insertions, 33 deletions
diff --git a/c/src/ada-tests/sptests/sp22/sptest.adb b/c/src/ada-tests/sptests/sp22/sptest.adb
index 95795683c2..03114d0463 100644
--- a/c/src/ada-tests/sptests/sp22/sptest.adb
+++ b/c/src/ada-tests/sptests/sp22/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,17 @@ with INTERFACES; use INTERFACES;
with TEST_SUPPORT;
with TEXT_IO;
with UNSIGNED32_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;
@@ -45,13 +46,13 @@ 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.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' );
- RTEMS.TASK_CREATE(
+ RTEMS.TASKS.CREATE(
SPTEST.TASK_NAME( 1 ),
1,
2048,
@@ -62,7 +63,7 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
- RTEMS.TASK_START(
+ RTEMS.TASKS.START(
SPTEST.TASK_ID( 1 ),
SPTEST.TASK_1'ACCESS,
0,
@@ -71,7 +72,7 @@ package body SPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
TEXT_IO.PUT_LINE( "INIT - timer_create - creating timer 1" );
- RTEMS.TIMER_CREATE(
+ RTEMS.TIMER.CREATE(
SPTEST.TIMER_NAME( 1 ),
SPTEST.TIMER_ID( 1 ),
STATUS
@@ -81,12 +82,11 @@ package body SPTEST is
UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ), WIDTH => 8, BASE => 16 );
TEXT_IO.PUT_LINE( ")" );
- RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+ RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
end INIT;
---PAGE
--
-- DELAYED_RESUME
--
@@ -100,12 +100,11 @@ package body SPTEST is
STATUS : RTEMS.STATUS_CODES;
begin
- RTEMS.TASK_RESUME( SPTEST.TASK_ID( 1 ), STATUS );
+ RTEMS.TASKS.RESUME( SPTEST.TASK_ID( 1 ), STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF SELF" );
end DELAYED_RESUME;
---PAGE
--
-- PRINT_TIME
--
@@ -116,7 +115,7 @@ package body SPTEST is
STATUS : RTEMS.STATUS_CODES;
begin
- 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" );
TEST_SUPPORT.PUT_NAME(
@@ -129,13 +128,12 @@ package body SPTEST is
end PRINT_TIME;
---PAGE
--
-- TASK_1
--
procedure TASK_1 (
- ARGUMENT : in RTEMS.TASK_ARGUMENT
+ ARGUMENT : in RTEMS.TASKS.ARGUMENT
) is
pragma Unreferenced(ARGUMENT);
TMID : RTEMS.ID;
@@ -146,7 +144,7 @@ package body SPTEST is
-- GET ID
TEXT_IO.PUT_LINE( "TA1 - timer_ident - identing timer 1" );
- RTEMS.TIMER_IDENT( SPTEST.TIMER_NAME( 1 ), TMID, STATUS );
+ RTEMS.TIMER.IDENT( SPTEST.TIMER_NAME( 1 ), TMID, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_IDENT OF TM1" );
TEXT_IO.PUT( "TA1 - timer 1 has id (" );
UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ), WIDTH => 8, BASE => 16 );
@@ -157,7 +155,7 @@ package body SPTEST is
SPTEST.PRINT_TIME;
TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" );
- RTEMS.TIMER_FIRE_AFTER(
+ RTEMS.TIMER.FIRE_AFTER(
TMID,
3 * TEST_SUPPORT.TICKS_PER_SECOND,
SPTEST.DELAYED_RESUME'ACCESS,
@@ -167,7 +165,7 @@ package body SPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" );
- RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
+ RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
SPTEST.PRINT_TIME;
@@ -175,7 +173,7 @@ package body SPTEST is
-- AFTER WHICH IS RESET AND ALLOWED TO FIRE
TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" );
- RTEMS.TIMER_FIRE_AFTER(
+ RTEMS.TIMER.FIRE_AFTER(
TMID,
3 * TEST_SUPPORT.TICKS_PER_SECOND,
SPTEST.DELAYED_RESUME'ACCESS,
@@ -185,17 +183,17 @@ package body SPTEST is
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
TEXT_IO.PUT_LINE( "TA1 - task_wake_after - 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" );
SPTEST.PRINT_TIME;
TEXT_IO.PUT_LINE( "TA1 - timer_reset - timer 1" );
- RTEMS.TIMER_RESET( TMID, STATUS );
+ RTEMS.TIMER.RESET( TMID, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_RESET" );
TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" );
- RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
+ RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
SPTEST.PRINT_TIME;
@@ -210,13 +208,13 @@ TEST_SUPPORT.PAUSE;
TIME := ( 1988, 12, 31, 9, 0, 7, 0 );
- RTEMS.CLOCK_SET( TIME, STATUS );
+ RTEMS.CLOCK.SET( TIME, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-- after which is canceled
TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" );
- RTEMS.TIMER_FIRE_AFTER(
+ RTEMS.TIMER.FIRE_AFTER(
TMID,
3 * TEST_SUPPORT.TICKS_PER_SECOND,
SPTEST.DELAYED_RESUME'ACCESS,
@@ -226,20 +224,20 @@ TEST_SUPPORT.PAUSE;
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
TEXT_IO.PUT_LINE( "TA1 - timer_cancel - timer 1" );
- RTEMS.TIMER_CANCEL( TMID, STATUS );
+ RTEMS.TIMER.CANCEL( TMID, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-- when which is allowed to fire
SPTEST.PRINT_TIME;
- 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" );
TIME.SECOND := TIME.SECOND + 3;
TEXT_IO.PUT_LINE( "TA1 - timer_when - timer 1 in 3 seconds" );
- RTEMS.TIMER_FIRE_WHEN(
+ RTEMS.TIMER.FIRE_WHEN(
TMID,
TIME,
SPTEST.DELAYED_RESUME'ACCESS,
@@ -249,20 +247,20 @@ TEST_SUPPORT.PAUSE;
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN" );
TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" );
- RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
+ RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
SPTEST.PRINT_TIME;
-- when which is canceled
- 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" );
TIME.SECOND := TIME.SECOND + 3;
TEXT_IO.PUT_LINE( "TA1 - timer_when - timer 1 in 3 seconds" );
- RTEMS.TIMER_FIRE_WHEN(
+ RTEMS.TIMER.FIRE_WHEN(
TMID,
TIME,
SPTEST.DELAYED_RESUME'ACCESS,
@@ -272,13 +270,13 @@ TEST_SUPPORT.PAUSE;
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN" );
TEXT_IO.PUT_LINE( "TA1 - task_wake_after - 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" );
SPTEST.PRINT_TIME;
TEXT_IO.PUT_LINE( "TA1 - timer_cancel - timer 1" );
- RTEMS.TIMER_CANCEL( TMID, STATUS );
+ RTEMS.TIMER.CANCEL( TMID, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-- delete
@@ -286,11 +284,11 @@ TEST_SUPPORT.PAUSE;
TEXT_IO.PUT_LINE(
"TA1 - task_wake_after - YIELD (only task at priority)"
);
- RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
+ RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" );
TEXT_IO.PUT_LINE( "TA1 - timer_delete - timer 1" );
- RTEMS.TIMER_DELETE( TMID, STATUS );
+ RTEMS.TIMER.DELETE( TMID, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_DELETE" );
TEXT_IO.PUT_LINE( "*** END OF TEST 22 ***" );