Changeset be1c11ed in rtems for cpukit/sapi

Timestamp:

05/29/96 22:48:26 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a96a713

Parents:

dd32d883

Message:

tests now specify whether using posix initialization threads table
or rtems initialization table in configuration table

File:

• cpukit/sapi/include/confdefs.h (modified) (5 diffs)

cpukit/sapi/include/confdefs.h

@@ -28 +28 @@
 extern rtems_multiprocessing_table      Multiprocessing_configuration;
 #ifdef RTEMS_POSIX_API
-extern posix_api_configuration_table Configuration_POSIX_API;
+extern posix_api_configuration_table    Configuration_POSIX_API;
 #endif
 
@@ -36 +36 @@
  */
 
-#ifndef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
+#ifdef CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
+
+/*
+ *  The user is defining their own table information and setting the 
+ *  appropriate variables.
+ */
+
+#else
 
 #ifndef CONFIGURE_INIT_TASK_NAME
@@ -84 +93 @@
   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
 
+#endif    /* CONFIGURE_HAS_OWN_INIT_TASK_TABLE */
+
+#else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
+
+#define CONFIGURE_INIT_TASK_TABLE      NULL
+#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
+
 #endif
 
@@ -266 +282 @@
 #endif
 
-#ifndef CONFIGURE_POSIX_HAS_OWN_INIT_TASK_TABLE
-
-#ifndef CONFIGURE_POSIX_INIT_TASK_ENTRY_POINT
-#define CONFIGURE_POSIX_INIT_TASK_ENTRY_POINT   Init 
+#ifdef CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#ifdef CONFIGURE_POSIX_HAS_OWN_INIT_THREAD_TABLE
+
+/*
+ *  The user is defining their own table information and setting the
+ *  appropriate variables.
+ */
+ 
+#else
+
+#ifndef CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT
+#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT   POSIX_Init 
 #endif
 
 #ifdef CONFIGURE_INIT
-posix_initialization_tasks_table POSIX_Initialization_tasks[] = {
-  { CONFIGURE_POSIX_INIT_TASK_ENTRY_POINT }
-};
-#endif
-
-#define CONFIGURE_POSIX_INIT_TASK_TABLE POSIX_Initialization_tasks
- 
-#define CONFIGURE_POSIX_INIT_TASK_TABLE_SIZE \
-  sizeof(CONFIGURE_POSIX_INIT_TASK_TABLE) / \
-      sizeof(posix_initialization_tasks_table)
+posix_initialization_threads_table POSIX_Initialization_threads[] = {
+  { CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT }
+};
+#endif
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME POSIX_Initialization_threads
+ 
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE \
+  sizeof(CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME) / \
+      sizeof(posix_initialization_threads_table)
 
 #endif    /* CONFIGURE_POSIX_HAS_OWN_INIT_TASK_TABLE */
+
+#else     /* CONFIGURE_POSIX_INIT_THREAD_TABLE */
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME NULL
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE 0
+
+#endif
 
 #endif    /* RTEMS_POSIX_API */
@@ -413 +445 @@
   CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES,
   CONFIGURE_MAXIMUM_POSIX_KEYS,
-  CONFIGURE_POSIX_INIT_TASK_TABLE_SIZE,
-  CONFIGURE_POSIX_INIT_TASK_TABLE
+  CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE,
+  CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME
 };
 #endif