summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-18 12:55:58 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-18 12:55:58 +0000
commit399c2e5d5a4cdcfb985e28295ce50c940a5a3e37 (patch)
tree6ce8ee39c89dcdd46442a49a9583d6bc6ff758cb /c
parent2000-10-17 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-399c2e5d5a4cdcfb985e28295ce50c940a5a3e37.tar.bz2
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.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/sapi/ChangeLog6
-rw-r--r--c/src/exec/sapi/include/confdefs.h28
2 files changed, 29 insertions, 5 deletions
diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog
index 34be18c422..49a06dc20b 100644
--- a/c/src/exec/sapi/ChangeLog
+++ b/c/src/exec/sapi/ChangeLog
@@ -1,3 +1,9 @@
+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>
* include/confdefs.h: Account for initialization tasks and
diff --git a/c/src/exec/sapi/include/confdefs.h b/c/src/exec/sapi/include/confdefs.h
index cacb6cdf63..7f8d9f00e8 100644
--- a/c/src/exec/sapi/include/confdefs.h
+++ b/c/src/exec/sapi/include/confdefs.h
@@ -712,8 +712,8 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = {
((_fixed_memory_pools) * \
( 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
@@ -733,7 +733,7 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = {
CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS ) + \
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 \
)
@@ -844,10 +844,28 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = {
CONFIGURE_INTERRUPT_STACK_MEMORY /* interrupt stack */ \
)
+/*
+ * 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 \
(( CONFIGURE_MEMORY_FOR_POSIX + \