Changeset 399c2e5d in rtems

Timestamp:

10/18/00 12:55:58 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

38e5a9f

Parents:

1fba44d

Message:

2000-10-18 Joel Sherrill <joel@…>

• include/confdefs.h: Modified code that accounts for initialization task/threads with greater than minimum stack sizes so it would compile even if optional APIs are disabled.

Files:

• c/src/exec/sapi/ChangeLog (modified) (1 diff)
• c/src/exec/sapi/include/confdefs.h (modified) (3 diffs)
• cpukit/sapi/ChangeLog (modified) (1 diff)
• cpukit/sapi/include/confdefs.h (modified) (3 diffs)

c/src/exec/sapi/ChangeLog

@@ +1 @@
+2000-10-18      Joel Sherrill <joel@OARcorp.com>
+
+        * include/confdefs.h: Modified code that accounts for initialization
+        task/threads with greater than minimum stack sizes so it would
+        compile even if optional APIs are disabled.
+
 2000-10-12      Joel Sherrill <joel@OARcorp.com>
 

c/src/exec/sapi/include/confdefs.h

@@ -713 +713 @@
    ( sizeof(ITRON_Fixed_memory_pool_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
 
-#ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZES
-#define CONFIGURE_ITRON_INIT_TASK_STACK_SIZES (RTEMS_MINIMUM_STACK_SIZE * 2)
+#ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZE
+#define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
 #endif
 
@@ -734 +734 @@
     CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS( \
         CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS ) + \
-    CONFIGURE_ITRON_INIT_TASK_STACK_SIZES \
+    CONFIGURE_ITRON_INIT_TASK_STACK_SIZE \
    )
 
@@ -845 +845 @@
   )
 
+/*
+ *  Now account for any extra memory that initialization tasks or threads
+ *  may have requested.
+ */
+
+#ifdef RTEMS_POSIX_API
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART \
+    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
+#else
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART 0
+#endif
+#ifdef RTEMS_ITRON_API
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART \
+    (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
+#else
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART 0
+#endif
+
 #define CONFIGURE_INITIALIZATION_THREADS_STACKS \
    ((CONFIGURE_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
-    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
-    (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE))
+    CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART + \
+    CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART)
 
 #define CONFIGURE_EXECUTIVE_RAM_SIZE \

cpukit/sapi/ChangeLog

@@ +1 @@
+2000-10-18      Joel Sherrill <joel@OARcorp.com>
+
+        * include/confdefs.h: Modified code that accounts for initialization
+        task/threads with greater than minimum stack sizes so it would
+        compile even if optional APIs are disabled.
+
 2000-10-12      Joel Sherrill <joel@OARcorp.com>
 

cpukit/sapi/include/confdefs.h

@@ -713 +713 @@
    ( sizeof(ITRON_Fixed_memory_pool_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
 
-#ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZES
-#define CONFIGURE_ITRON_INIT_TASK_STACK_SIZES (RTEMS_MINIMUM_STACK_SIZE * 2)
+#ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZE
+#define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
 #endif
 
@@ -734 +734 @@
     CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS( \
         CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS ) + \
-    CONFIGURE_ITRON_INIT_TASK_STACK_SIZES \
+    CONFIGURE_ITRON_INIT_TASK_STACK_SIZE \
    )
 
@@ -845 +845 @@
   )
 
+/*
+ *  Now account for any extra memory that initialization tasks or threads
+ *  may have requested.
+ */
+
+#ifdef RTEMS_POSIX_API
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART \
+    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
+#else
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART 0
+#endif
+#ifdef RTEMS_ITRON_API
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART \
+    (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
+#else
+#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART 0
+#endif
+
 #define CONFIGURE_INITIALIZATION_THREADS_STACKS \
    ((CONFIGURE_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
-    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
-    (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE))
+    CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART + \
+    CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART)
 
 #define CONFIGURE_EXECUTIVE_RAM_SIZE \