From 23848bbd80f00aa8e271322f19871c0ba1366803 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 1 Oct 2007 22:58:09 +0000 Subject: 2007-10-01 Joel Sherrill * mptests/mp01/mptest.adb, mptests/mp01/mptest.ads, mptests/mp01/node1/Makefile.am, mptests/mp02/mptest.adb, mptests/mp02/mptest.ads, mptests/mp03/mptest.adb, mptests/mp03/mptest.ads, mptests/mp04/mptest.adb, mptests/mp04/mptest.ads, mptests/mp05/mptest.adb, mptests/mp05/mptest.ads, mptests/mp06/mptest.adb, mptests/mp06/mptest.ads, mptests/mp07/mptest.adb, mptests/mp07/mptest.ads, mptests/mp08/mptest.adb, mptests/mp08/mptest.ads, mptests/mp09/mptest.adb, mptests/mp09/mptest.ads, mptests/mp10/mptest.adb, mptests/mp10/mptest.ads, mptests/mp11/mptest.adb, mptests/mp11/mptest.ads, mptests/mp12/mptest.adb, mptests/mp12/mptest.ads, mptests/mp13/mptest.adb, mptests/mp13/mptest.ads, mptests/mp14/mptest.adb, mptests/mp14/mptest.ads, support/init.c, support/test_support.adb, support/test_support.ads: Most of single processor Ada tests now build. Some run. --- c/src/ada-tests/support/init.c | 18 +++++++++++++++++ c/src/ada-tests/support/test_support.adb | 34 +++++++++++++++++++++++++++++--- c/src/ada-tests/support/test_support.ads | 17 ++++++++++++++-- 3 files changed, 64 insertions(+), 5 deletions(-) (limited to 'c/src/ada-tests/support') diff --git a/c/src/ada-tests/support/init.c b/c/src/ada-tests/support/init.c index b4059c2055..b670bd3510 100644 --- a/c/src/ada-tests/support/init.c +++ b/c/src/ada-tests/support/init.c @@ -31,6 +31,7 @@ rtems_id tcb_to_id( return tcb->Object.id; } + /* * By putting this in brackets rather than quotes, we get the search * path and can get this file from ".." in the mptests. @@ -41,3 +42,20 @@ rtems_id tcb_to_id( #define CONFIGURE_MEMORY_OVERHEAD (256) #include + +uint32_t milliseconds_per_tick(void) +{ + return CONFIGURE_MICROSECONDS_PER_TICK / 1000; +} + +uint32_t ticks_per_second(void) +{ + /* XXX HACK -- use public API */ + return TOD_TICKS_PER_SECOND; +} + +uint32_t get_node(void) +{ + /* XXX HACK -- use public API */ + return _Objects_Local_node; +} diff --git a/c/src/ada-tests/support/test_support.adb b/c/src/ada-tests/support/test_support.adb index ee2e96f5b0..ae676aea09 100644 --- a/c/src/ada-tests/support/test_support.adb +++ b/c/src/ada-tests/support/test_support.adb @@ -206,8 +206,10 @@ package body Test_Support is ) return RTEMS.Unsigned32 is begin - return RTEMS.Get_Index( TID ) - 1 - - RTEMS.Configuration.RTEMS_API_Configuration.Number_Of_Initialization_Tasks; + -- probably OK + return RTEMS.Get_Index( TID ) - 1; + -- Ignoring this component. + -- - RTEMS.Configuration.RTEMS_API_Configuration.Number_Of_Initialization_Tasks; end Task_Number; @@ -229,7 +231,33 @@ package body Test_Support is function Milliseconds_Per_Tick return RTEMS.Unsigned32 is + function Milliseconds_Per_Tick_Base return RTEMS.Unsigned32; + pragma Import (C, Milliseconds_Per_Tick_Base, "milliseconds_per_tick"); begin - return RTEMS.Configuration.Microseconds_Per_Tick / 1000; + return Milliseconds_Per_Tick_Base; end Milliseconds_Per_Tick; + +--PAGE +-- +-- Milliseconds_Per_Tick +-- + function Ticks_Per_Second + return RTEMS.Interval is + function Ticks_Per_Second_Base return RTEMS.Unsigned32; + pragma Import (C, Ticks_Per_Second_Base, "ticks_per_second"); + begin + return Ticks_Per_Second_Base; + end Ticks_Per_Second; + +-- +-- Node is the node number in a multiprocessor configuration +-- + + function Node + return RTEMS.Unsigned32 is + function Get_Node_Base return RTEMS.Unsigned32; + pragma Import (C, Get_Node_Base, "get_node"); + begin + return Get_Node_Base; + end Node; end Test_Support; diff --git a/c/src/ada-tests/support/test_support.ads b/c/src/ada-tests/support/test_support.ads index eef9c22ede..8122c13f61 100644 --- a/c/src/ada-tests/support/test_support.ads +++ b/c/src/ada-tests/support/test_support.ads @@ -156,8 +156,8 @@ package Test_Support is -- occur each second. -- - Ticks_Per_Second : RTEMS.Interval; - pragma Import (C, Ticks_Per_Second, "_TOD_Ticks_per_second"); + function Ticks_Per_Second + return RTEMS.Interval; -- -- Milliseconds_Per_Tick is the number of milliseconds which @@ -167,6 +167,19 @@ package Test_Support is function Milliseconds_Per_Tick return RTEMS.Unsigned32; +-- +-- Node is the node number in a multiprocessor configuration +-- + + function Node + return RTEMS.Unsigned32; + +-- +-- Longest time in seconds to run a test +-- + + MAXIMUM_LONG_TEST_DURATION : RTEMS.UNSIGNED32; + private end Test_Support; -- cgit v1.2.3