diff options
Diffstat (limited to 'c/src/ada-tests/mptests/mp05')
| -rw-r--r-- | c/src/ada-tests/mptests/mp05/mptest.adb | 12 | ||||
| -rw-r--r-- | c/src/ada-tests/mptests/mp05/mptest.ads | 107 |
2 files changed, 7 insertions, 112 deletions
diff --git a/c/src/ada-tests/mptests/mp05/mptest.adb b/c/src/ada-tests/mptests/mp05/mptest.adb index 63033279a2..748f75ebc3 100644 --- a/c/src/ada-tests/mptests/mp05/mptest.adb +++ b/c/src/ada-tests/mptests/mp05/mptest.adb @@ -28,8 +28,6 @@ with UNSIGNED32_IO; package body MPTEST is - package body PER_NODE_CONFIGURATION is separate; - --PAGE -- -- INIT @@ -44,7 +42,7 @@ package body MPTEST is TEXT_IO.NEW_LINE( 2 ); TEXT_IO.PUT( "*** TEST 5 -- NODE " ); UNSIGNED32_IO.PUT( - MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, + TEST_SUPPORT.NODE, WIDTH => 1 ); TEXT_IO.PUT_LINE( " ***" ); @@ -55,7 +53,7 @@ package body MPTEST is TEXT_IO.PUT_LINE( "Creating Test_task (Global)" ); RTEMS.TASK_CREATE( - MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), + MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 1, 2048, RTEMS.TIMESLICE, @@ -79,7 +77,7 @@ package body MPTEST is MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME( 'T', 'M', '2', ' ' ); RTEMS.TIMER_CREATE( - MPTEST.TIMER_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), + MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ), MPTEST.TIMER_ID( 1 ), STATUS ); @@ -158,7 +156,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" ); - if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then + if TEST_SUPPORT.NODE = 1 then MPTEST.REMOTE_NODE := 2; MPTEST.REMOTE_SIGNAL := RTEMS.SIGNAL_18; MPTEST.EXPECTED_SIGNAL := RTEMS.SIGNAL_17; @@ -194,7 +192,7 @@ package body MPTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" ); - if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then + if TEST_SUPPORT.NODE = 1 then TEXT_IO.PUT_LINE( "Sending signal to remote task" ); loop diff --git a/c/src/ada-tests/mptests/mp05/mptest.ads b/c/src/ada-tests/mptests/mp05/mptest.ads index 411ec27f2b..c3e5470ba3 100644 --- a/c/src/ada-tests/mptests/mp05/mptest.ads +++ b/c/src/ada-tests/mptests/mp05/mptest.ads @@ -43,7 +43,7 @@ package MPTEST is -- -- This variable is set when the test should stop executing. -- - STOP_TEST : RTEMS.BOOLEAN; + STOP_TEST : BOOLEAN; -- -- This variable contains the ID of the remote task with which this @@ -77,7 +77,7 @@ package MPTEST is -- signal sets have been caught cumulative. -- - SIGNAL_CAUGHT : RTEMS.BOOLEAN; + SIGNAL_CAUGHT : BOOLEAN; SIGNAL_COUNT : RTEMS.UNSIGNED32; -- @@ -135,107 +135,4 @@ package MPTEST is ARGUMENT : in RTEMS.TASK_ARGUMENT ); --- --- This is the Driver Address Table for this test. --- - - DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) := - (1=> - ( - CLOCK_DRIVER.INITIALIZE'ACCESS, -- Initialization - RTEMS.NO_DRIVER_ENTRY, -- Open - RTEMS.NO_DRIVER_ENTRY, -- Close - RTEMS.NO_DRIVER_ENTRY, -- Read - RTEMS.NO_DRIVER_ENTRY, -- Write - RTEMS.NO_DRIVER_ENTRY -- Control - ) - ); - --- --- This is the Initialization Tasks Table for this test. --- - - INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := - (1=> - ( - RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ), -- task name - 2048, -- stack size - 1, -- priority - RTEMS.DEFAULT_ATTRIBUTES, -- attributes - MPTEST.INIT'ACCESS, -- entry point - RTEMS.NO_PREEMPT, -- initial mode - 0 -- argument list - ) - ); - ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- --- BEGIN SUBPACKAGE -- ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- - - -- - -- MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION - -- - -- DESCRIPTION: - -- - -- This package is the specification for the subpackage - -- which will define the per node configuration parameters. - -- - - package PER_NODE_CONFIGURATION is - - -- - -- LOCAL_NODE_NUMBER - -- - -- DESCRIPTION: - -- - -- This function returns the node number for this node. - -- - - function LOCAL_NODE_NUMBER - return RTEMS.UNSIGNED32; - - pragma INLINE ( LOCAL_NODE_NUMBER ); - - end PER_NODE_CONFIGURATION; - ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- --- END SUBPACKAGE -- ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- - --- --- This is the Multiprocessor Configuration Table for this test. --- - - MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := ( - MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER, - 2, -- maximum # nodes in system - 32, -- maximum # global objects - 32 -- maximum # proxies - ); - --- --- This is the Configuration Table for this test. --- - - CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := ( - RTEMS.NULL_ADDRESS, -- will be replaced by BSP - 64 * 1024, -- executive RAM size - 10, -- maximum # tasks - 1, -- maximum # timers - 2, -- maximum # semaphores - 0, -- maximum # message queues - 0, -- maximum # messages - 0, -- maximum # partitions - 0, -- maximum # regions - 0, -- maximum # dp memory areas - 0, -- maximum # periods - 0, -- maximum # user extensions - RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick - 50 -- # ticks in a timeslice - ); - end MPTEST; |