summaryrefslogtreecommitdiffstats
path: root/c/src/tests/mptests
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/tests/mptests')
-rw-r--r--c/src/tests/mptests/mp01/init.c5
-rw-r--r--c/src/tests/mptests/mp01/system.h26
-rw-r--r--c/src/tests/mptests/mp02/init.c5
-rw-r--r--c/src/tests/mptests/mp02/system.h24
-rw-r--r--c/src/tests/mptests/mp03/init.c5
-rw-r--r--c/src/tests/mptests/mp03/system.h37
-rw-r--r--c/src/tests/mptests/mp04/init.c5
-rw-r--r--c/src/tests/mptests/mp04/system.h26
-rw-r--r--c/src/tests/mptests/mp05/init.c5
-rw-r--r--c/src/tests/mptests/mp05/system.h40
-rw-r--r--c/src/tests/mptests/mp06/init.c5
-rw-r--r--c/src/tests/mptests/mp06/system.h30
-rw-r--r--c/src/tests/mptests/mp07/init.c5
-rw-r--r--c/src/tests/mptests/mp07/system.h31
-rw-r--r--c/src/tests/mptests/mp08/init.c5
-rw-r--r--c/src/tests/mptests/mp08/system.h30
-rw-r--r--c/src/tests/mptests/mp09/init.c5
-rw-r--r--c/src/tests/mptests/mp09/system.h39
-rw-r--r--c/src/tests/mptests/mp10/init.c5
-rw-r--r--c/src/tests/mptests/mp10/system.h43
-rw-r--r--c/src/tests/mptests/mp11/init.c5
-rw-r--r--c/src/tests/mptests/mp11/system.h35
-rw-r--r--c/src/tests/mptests/mp12/init.c5
-rw-r--r--c/src/tests/mptests/mp12/system.h34
-rw-r--r--c/src/tests/mptests/mp13/init.c5
-rw-r--r--c/src/tests/mptests/mp13/system.h39
-rw-r--r--c/src/tests/mptests/mp14/init.c7
-rw-r--r--c/src/tests/mptests/mp14/system.h97
28 files changed, 475 insertions, 128 deletions
diff --git a/c/src/tests/mptests/mp01/init.c b/c/src/tests/mptests/mp01/init.c
index 2af49c8a6b..1a4c9463e4 100644
--- a/c/src/tests/mptests/mp01/init.c
+++ b/c/src/tests/mptests/mp01/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp01/system.h b/c/src/tests/mptests/mp01/system.h
index 1110c1574f..54e0134a7d 100644
--- a/c/src/tests/mptests/mp01/system.h
+++ b/c/src/tests/mptests/mp01/system.h
@@ -16,14 +16,30 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_GLOBAL
-#include <gvar.h>
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp02/init.c b/c/src/tests/mptests/mp02/init.c
index 75d8565785..22e145d6c6 100644
--- a/c/src/tests/mptests/mp02/init.c
+++ b/c/src/tests/mptests/mp02/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp02/system.h b/c/src/tests/mptests/mp02/system.h
index 0bf193dad9..8e2e95806d 100644
--- a/c/src/tests/mptests/mp02/system.h
+++ b/c/src/tests/mptests/mp02/system.h
@@ -16,14 +16,28 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#include <confdefs.h>
-#include "gvar.h"
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp03/init.c b/c/src/tests/mptests/mp03/init.c
index a1f210dad1..861a77ef2d 100644
--- a/c/src/tests/mptests/mp03/init.c
+++ b/c/src/tests/mptests/mp03/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp03/system.h b/c/src/tests/mptests/mp03/system.h
index 0bf193dad9..39ba36ede3 100644
--- a/c/src/tests/mptests/mp03/system.h
+++ b/c/src/tests/mptests/mp03/system.h
@@ -16,14 +16,41 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+rtems_timer_service_routine Delayed_send_event(
+ rtems_id ignored_id,
+ void *ignored_address
+);
+
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
-#include "gvar.h"
+#include <confdefs.h>
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Timer_id[ 2 ]; /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 2 ]; /* array of timer names */
+
+TEST_EXTERN rtems_unsigned32 remote_node;
+TEST_EXTERN rtems_id remote_tid;
+
/* end of include file */
diff --git a/c/src/tests/mptests/mp04/init.c b/c/src/tests/mptests/mp04/init.c
index 106176c6ca..adc21b9f0c 100644
--- a/c/src/tests/mptests/mp04/init.c
+++ b/c/src/tests/mptests/mp04/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp04/system.h b/c/src/tests/mptests/mp04/system.h
index 0bf193dad9..f67d16fe53 100644
--- a/c/src/tests/mptests/mp04/system.h
+++ b/c/src/tests/mptests/mp04/system.h
@@ -16,14 +16,30 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
-#include "gvar.h"
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp05/init.c b/c/src/tests/mptests/mp05/init.c
index 5db791d8f2..b6338f9a5d 100644
--- a/c/src/tests/mptests/mp05/init.c
+++ b/c/src/tests/mptests/mp05/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp05/system.h b/c/src/tests/mptests/mp05/system.h
index 0bf193dad9..2ebc8b47b5 100644
--- a/c/src/tests/mptests/mp05/system.h
+++ b/c/src/tests/mptests/mp05/system.h
@@ -16,14 +16,44 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+rtems_asr Process_asr( rtems_signal_set );
-#include "gvar.h"
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Timer_id[ 2 ]; /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 2 ]; /* array of timer names */
+
+TEST_EXTERN volatile rtems_boolean Stop_Test;
+
+TEST_EXTERN rtems_unsigned32 remote_node;
+TEST_EXTERN rtems_id remote_tid;
+TEST_EXTERN rtems_signal_set remote_signal;
+TEST_EXTERN rtems_signal_set expected_signal;
+TEST_EXTERN volatile rtems_unsigned32 signal_count;
+TEST_EXTERN volatile rtems_unsigned32 signal_caught;
+
/* end of include file */
diff --git a/c/src/tests/mptests/mp06/init.c b/c/src/tests/mptests/mp06/init.c
index ab41308954..8639554703 100644
--- a/c/src/tests/mptests/mp06/init.c
+++ b/c/src/tests/mptests/mp06/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp06/system.h b/c/src/tests/mptests/mp06/system.h
index 416af01a5d..a7c0048cdd 100644
--- a/c/src/tests/mptests/mp06/system.h
+++ b/c/src/tests/mptests/mp06/system.h
@@ -16,15 +16,35 @@
#include <tmacros.h>
+/* functions */
-/* Miscellaneous */
+rtems_task Init(
+ rtems_task_argument argument
+);
-#define EXTERN extern /* external definition */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* macros */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
-/* structures */
+#include <confdefs.h>
-#include "gvar.h"
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Timer_id[ 4 ]; /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 4 ]; /* array of timer names */
+
+TEST_EXTERN volatile rtems_boolean Stop_Test;
/* end of include file */
diff --git a/c/src/tests/mptests/mp07/init.c b/c/src/tests/mptests/mp07/init.c
index 665c3f0b72..1d18eccd79 100644
--- a/c/src/tests/mptests/mp07/init.c
+++ b/c/src/tests/mptests/mp07/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp07/system.h b/c/src/tests/mptests/mp07/system.h
index 96286ca802..a7c0048cdd 100644
--- a/c/src/tests/mptests/mp07/system.h
+++ b/c/src/tests/mptests/mp07/system.h
@@ -16,12 +16,35 @@
#include <tmacros.h>
-#define EXTERN extern /* external definition */
+/* functions */
-/* macros */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* structures */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-#include "gvar.h"
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
+
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Timer_id[ 4 ]; /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 4 ]; /* array of timer names */
+
+TEST_EXTERN volatile rtems_boolean Stop_Test;
/* end of include file */
diff --git a/c/src/tests/mptests/mp08/init.c b/c/src/tests/mptests/mp08/init.c
index 6f43d6635d..229a47afef 100644
--- a/c/src/tests/mptests/mp08/init.c
+++ b/c/src/tests/mptests/mp08/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp08/system.h b/c/src/tests/mptests/mp08/system.h
index 0bf193dad9..42a2287af5 100644
--- a/c/src/tests/mptests/mp08/system.h
+++ b/c/src/tests/mptests/mp08/system.h
@@ -16,14 +16,34 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
-#include "gvar.h"
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Semaphore_id[ 2 ]; /* array of semaphore ids */
+TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp09/init.c b/c/src/tests/mptests/mp09/init.c
index cbd612a267..95c837689a 100644
--- a/c/src/tests/mptests/mp09/init.c
+++ b/c/src/tests/mptests/mp09/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp09/system.h b/c/src/tests/mptests/mp09/system.h
index 0bf193dad9..3060262e8e 100644
--- a/c/src/tests/mptests/mp09/system.h
+++ b/c/src/tests/mptests/mp09/system.h
@@ -16,14 +16,43 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-/* structures */
+void Receive_messages( void );
-#include "gvar.h"
+void Send_messages( void );
+
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TIMERS 1
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Queue_id[ 2 ]; /* array of message queue ids */
+TEST_EXTERN rtems_name Queue_name[ 2 ]; /* array of message queue names */
+
+extern char buffer1[16];
+extern char buffer2[16];
+extern char buffer3[16];
+extern char buffer4[16];
/* end of include file */
diff --git a/c/src/tests/mptests/mp10/init.c b/c/src/tests/mptests/mp10/init.c
index 4d150be3da..b37be53a4c 100644
--- a/c/src/tests/mptests/mp10/init.c
+++ b/c/src/tests/mptests/mp10/init.c
@@ -28,11 +28,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp10/system.h b/c/src/tests/mptests/mp10/system.h
index 0bf193dad9..2c6d54d6a8 100644
--- a/c/src/tests/mptests/mp10/system.h
+++ b/c/src/tests/mptests/mp10/system.h
@@ -16,14 +16,47 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
+
+rtems_task Test_task1(
+ rtems_task_argument argument
+);
+
+rtems_task Test_task2(
+ rtems_task_argument argument
+);
+
+rtems_task Test_task3(
+ rtems_task_argument restart
+);
-/* macros */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#if ( NODE_NUMBER == 1 )
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#endif
-/* structures */
+#include <confdefs.h>
-#include "gvar.h"
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Queue_id[ 2 ]; /* array of message queue ids */
+TEST_EXTERN rtems_name Queue_name[ 2 ]; /* array of message queue names */
+
+TEST_EXTERN rtems_id Semaphore_id[ 2 ]; /* array of semaphore ids */
+TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp11/init.c b/c/src/tests/mptests/mp11/init.c
index a560b35159..5e3da0d8d0 100644
--- a/c/src/tests/mptests/mp11/init.c
+++ b/c/src/tests/mptests/mp11/init.c
@@ -25,11 +25,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_unsigned8 my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT;
diff --git a/c/src/tests/mptests/mp11/system.h b/c/src/tests/mptests/mp11/system.h
index 0bf193dad9..39ab88e08c 100644
--- a/c/src/tests/mptests/mp11/system.h
+++ b/c/src/tests/mptests/mp11/system.h
@@ -16,14 +16,39 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-/* structures */
+#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 0
+#define CONFIGURE_MP_MAXIMUM_PROXIES 0
+
+#if ( NODE_NUMBER == 1 )
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_PARTITIONS 1
+#endif
-#include "gvar.h"
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Queue_id[ 2 ]; /* array of message queue ids */
+TEST_EXTERN rtems_name Queue_name[ 2 ]; /* array of message queue names */
+
+TEST_EXTERN rtems_id Semaphore_id[ 2 ]; /* array of semaphore ids */
+TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp12/init.c b/c/src/tests/mptests/mp12/init.c
index ed56e192ae..93d472e6e6 100644
--- a/c/src/tests/mptests/mp12/init.c
+++ b/c/src/tests/mptests/mp12/init.c
@@ -27,11 +27,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_unsigned8 Partition_area[ 1024 ] CPU_STRUCTURE_ALIGNMENT;
diff --git a/c/src/tests/mptests/mp12/system.h b/c/src/tests/mptests/mp12/system.h
index 0bf193dad9..c743c4a415 100644
--- a/c/src/tests/mptests/mp12/system.h
+++ b/c/src/tests/mptests/mp12/system.h
@@ -16,14 +16,38 @@
#include <tmacros.h>
-/* Miscellaneous */
+#define PT_NAME rtems_build_name( 'P', 'A', 'R', '\0' )
-#define EXTERN extern /* external definition */
+/* functions */
-/* macros */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* structures */
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#include "gvar.h"
+#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 1
+#define CONFIGURE_MP_MAXIMUM_PROXIES 0
+
+#if ( NODE_NUMBER == 1 )
+#define CONFIGURE_MAXIMUM_PARTITIONS 1
+#elif ( NODE_NUMBER == 2 )
+#define CONFIGURE_MAXIMUM_PARTITIONS 2
+#endif
+
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Partition_id[ 2 ]; /* array of partition ids */
+TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp13/init.c b/c/src/tests/mptests/mp13/init.c
index cff264e506..af618aed7c 100644
--- a/c/src/tests/mptests/mp13/init.c
+++ b/c/src/tests/mptests/mp13/init.c
@@ -22,11 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
rtems_task Init(
rtems_task_argument argument
diff --git a/c/src/tests/mptests/mp13/system.h b/c/src/tests/mptests/mp13/system.h
index 0bf193dad9..c3b0924a18 100644
--- a/c/src/tests/mptests/mp13/system.h
+++ b/c/src/tests/mptests/mp13/system.h
@@ -16,14 +16,43 @@
#include <tmacros.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* macros */
+rtems_task Test_task1(
+ rtems_task_argument argument
+);
-/* structures */
+rtems_task Test_task2(
+ rtems_task_argument argument
+);
-#include "gvar.h"
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#if ( NODE_NUMBER == 1 )
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#endif
+
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Queue_id[ 2 ]; /* array of message queue ids */
+TEST_EXTERN rtems_name Queue_name[ 2 ]; /* array of message queue names */
+
+TEST_EXTERN rtems_id Semaphore_id[ 2 ]; /* array of semaphore ids */
+TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
/* end of include file */
diff --git a/c/src/tests/mptests/mp14/init.c b/c/src/tests/mptests/mp14/init.c
index bc35d86469..2b2070083b 100644
--- a/c/src/tests/mptests/mp14/init.c
+++ b/c/src/tests/mptests/mp14/init.c
@@ -22,13 +22,8 @@
* $Id$
*/
+#define TEST_INIT
#include "system.h"
-#undef EXTERN
-#define EXTERN
-#include "conftbl.h"
-#include "gvar.h"
-
-#include "bsp.h"
rtems_unsigned8 my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT;
diff --git a/c/src/tests/mptests/mp14/system.h b/c/src/tests/mptests/mp14/system.h
index d825e0ef69..051727e854 100644
--- a/c/src/tests/mptests/mp14/system.h
+++ b/c/src/tests/mptests/mp14/system.h
@@ -15,16 +15,101 @@
*/
#include <tmacros.h>
-#include <mpci.h>
-/* Miscellaneous */
+/* functions */
-#define EXTERN extern /* external definition */
+rtems_timer_service_routine Delayed_send_event(
+ rtems_id timer_id,
+ void *ignored_address
+);
-/* macros */
+rtems_task Init(
+ rtems_task_argument argument
+);
-/* structures */
+rtems_task Test_task(
+ rtems_task_argument argument
+);
-#include "gvar.h"
+rtems_task Delayed_events_task(
+ rtems_task_argument argument
+);
+
+rtems_task Message_queue_task(
+ rtems_task_argument index
+);
+
+rtems_task Partition_task(
+ rtems_task_argument argument
+);
+
+rtems_task Semaphore_task(
+ rtems_task_argument argument
+);
+
+void Exit_test( void );
+
+/* configuration information */
+
+#define CONFIGURE_MPTEST
+
+#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_TICKS_PER_TIMESLICE 1
+#define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)
+
+#if ( NODE_NUMBER == 1 )
+#define CONFIGURE_MAXIMUM_TIMERS 12
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_PARTITIONS 1
+#elif ( NODE_NUMBER == 2 )
+#define CONFIGURE_MAXIMUM_TIMERS 2
+#endif
+
+#include <confdefs.h>
+
+/* variables */
+
+TEST_EXTERN rtems_id Event_task_id[ 2 ]; /* event task ids */
+
+TEST_EXTERN rtems_id Semaphore_task_id[ 2 ]; /* semaphore task ids */
+TEST_EXTERN rtems_name Semaphore_task_name[ 2 ]; /* semaphore task names */
+
+TEST_EXTERN rtems_id Queue_task_id[ 3 ]; /* message queue task ids */
+TEST_EXTERN rtems_name Queue_task_name[ 3 ]; /* message queue task names */
+
+TEST_EXTERN rtems_id Partition_task_id[ 4 ]; /* partition task ids */
+TEST_EXTERN rtems_name Partition_task_name[ 4 ]; /* partition task names */
+
+TEST_EXTERN rtems_id Partition_id[ 3 ]; /* partition ids */
+TEST_EXTERN rtems_name Partition_name[ 3 ]; /* partition names */
+
+TEST_EXTERN rtems_id Semaphore_id[ 3 ]; /* semaphore ids */
+TEST_EXTERN rtems_name Semaphore_name[ 3 ]; /* semaphore names */
+
+TEST_EXTERN rtems_id Queue_id[ 3 ]; /* message queue ids */
+TEST_EXTERN rtems_name Queue_name[ 3 ]; /* message queue names */
+
+TEST_EXTERN rtems_id Task_id[ 4 ]; /* remote event task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ]; /* remote event task names */
+
+TEST_EXTERN rtems_id Timer_id[ 4 ]; /* event timer ids */
+TEST_EXTERN rtems_name Timer_name[ 4 ]; /* event timer names */
+
+TEST_EXTERN rtems_unsigned32 Msg_buffer[ 4 ][ 4 ];
+
+extern rtems_multiprocessing_table Multiprocessing_configuration;
+
+TEST_EXTERN volatile rtems_boolean Stop_Test;
+TEST_EXTERN rtems_id timer_id;
+
+#define EVENT_TASK_DOT_COUNT 100
+#define EVENT_SEND_DOT_COUNT 100
+#define DELAYED_EVENT_DOT_COUNT 1000
+#define MESSAGE_DOT_COUNT 200
+#define PARTITION_DOT_COUNT 200
+#define SEMAPHORE_DOT_COUNT 200
/* end of include file */