diff options
Diffstat (limited to 'c/src/ada-tests/tmtests/tm20/tmtest.adb')
-rw-r--r-- | c/src/ada-tests/tmtests/tm20/tmtest.adb | 80 |
1 files changed, 42 insertions, 38 deletions
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/c/src/ada-tests/tmtests/tm20/tmtest.adb index 506e5927df..69188c942e 100644 --- a/c/src/ada-tests/tmtests/tm20/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm20/tmtest.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 @@ -25,16 +25,17 @@ with RTEMS_CALLING_OVERHEAD; with TEST_SUPPORT; with TEXT_IO; with TIMER_DRIVER; +with RTEMS.PARTITION; +with RTEMS.REGION; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); STATUS : RTEMS.STATUS_CODES; @@ -43,7 +44,7 @@ package body TMTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT_LINE( "*** TIME TEST 20 ***" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '1' ), 128, 2048, @@ -54,7 +55,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 1 ), TMTEST.TASK_1'ACCESS, 0, @@ -62,7 +63,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" ); - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'I', 'M', '2' ), 129, 2048, @@ -73,7 +74,7 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" ); - RTEMS.TASK_START( + RTEMS.TASKS.START( TMTEST.TASK_ID( 2 ), TMTEST.TASK_2'ACCESS, 0, @@ -81,23 +82,22 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" ); - 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 -- procedure TASK_1 ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); BUFFER_COUNT : RTEMS.UNSIGNED32; PREVIOUS_MODE : RTEMS.MODE; - PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY; + PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; STATUS : RTEMS.STATUS_CODES; begin @@ -105,7 +105,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_CREATE( + RTEMS.PARTITION.CREATE( TMTEST.PARTITION_NAME, TMTEST.PARTITION_AREA'ADDRESS, 2048, @@ -128,7 +128,7 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_CREATE( + RTEMS.REGION.CREATE( TMTEST.REGION_NAME, TMTEST.REGION_AREA'ADDRESS, 2048, @@ -148,7 +148,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS @@ -166,7 +166,7 @@ package body TMTEST is BUFFER_COUNT := 0; loop - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESSES( BUFFER_COUNT ), STATUS @@ -179,7 +179,7 @@ package body TMTEST is end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_GET_BUFFER( + RTEMS.PARTITION.GET_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS @@ -195,7 +195,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS @@ -213,7 +213,7 @@ package body TMTEST is for INDEX in 0 .. BUFFER_COUNT - 1 loop - RTEMS.PARTITION_RETURN_BUFFER( + RTEMS.PARTITION.RETURN_BUFFER( TMTEST.PARTITION_ID, TMTEST.BUFFER_ADDRESSES( INDEX ), STATUS @@ -223,7 +223,7 @@ package body TMTEST is end loop; TIMER_DRIVER.INITIALIZE; - RTEMS.PARTITION_DELETE( TMTEST.PARTITION_ID, STATUS ); + RTEMS.PARTITION.DELETE( TMTEST.PARTITION_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -234,7 +234,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.PARTITION_DELETE ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -245,7 +245,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -264,7 +264,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.NO_WAIT, @@ -282,7 +282,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_3, STATUS @@ -290,7 +290,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS @@ -305,7 +305,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -316,7 +316,7 @@ package body TMTEST is TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.DEFAULT_OPTIONS, @@ -337,14 +337,14 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); - RTEMS.TASK_MODE( + RTEMS.TASKS.MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, PREVIOUS_MODE, @@ -352,10 +352,10 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" ); - RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS ); + RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 400, RTEMS.DEFAULT_OPTIONS, @@ -364,7 +364,7 @@ package body TMTEST is STATUS ); - RTEMS.REGION_GET_SEGMENT( + RTEMS.REGION.GET_SEGMENT( TMTEST.REGION_ID, 1998, RTEMS.DEFAULT_OPTIONS, @@ -372,18 +372,21 @@ package body TMTEST is TMTEST.BUFFER_ADDRESS_2, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" ); -- execute TASK_2 - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_2, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_DELETE( TMTEST.REGION_ID, STATUS ); + RTEMS.REGION.DELETE( TMTEST.REGION_ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE" ); TIME_TEST_SUPPORT.PUT_TIME( "REGION_DELETE", @@ -398,13 +401,12 @@ package body TMTEST 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; @@ -421,21 +423,23 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS ); -- preempt back to TASK_1 + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIMER_DRIVER.INITIALIZE; - RTEMS.REGION_RETURN_SEGMENT( + RTEMS.REGION.RETURN_SEGMENT( TMTEST.REGION_ID, TMTEST.BUFFER_ADDRESS_1, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" ); TIME_TEST_SUPPORT.PUT_TIME( "REGION_RETURN_SEGMENT (ready -- return)", @@ -445,7 +449,7 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT ); - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end TASK_2; |