Changeset 399c2e5d in rtems


Ignore:
Timestamp:
Oct 18, 2000, 12:55:58 PM (21 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:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/sapi/ChangeLog

    r1fba44d r399c2e5d  
     12000-10-18      Joel Sherrill <joel@OARcorp.com>
     2
     3        * include/confdefs.h: Modified code that accounts for initialization
     4        task/threads with greater than minimum stack sizes so it would
     5        compile even if optional APIs are disabled.
     6
    172000-10-12      Joel Sherrill <joel@OARcorp.com>
    28
  • c/src/exec/sapi/include/confdefs.h

    r1fba44d r399c2e5d  
    713713   ( sizeof(ITRON_Fixed_memory_pool_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
    714714
    715 #ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZES
    716 #define CONFIGURE_ITRON_INIT_TASK_STACK_SIZES (RTEMS_MINIMUM_STACK_SIZE * 2)
     715#ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZE
     716#define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
    717717#endif
    718718
     
    734734    CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS( \
    735735        CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS ) + \
    736     CONFIGURE_ITRON_INIT_TASK_STACK_SIZES \
     736    CONFIGURE_ITRON_INIT_TASK_STACK_SIZE \
    737737   )
    738738
     
    845845  )
    846846
     847/*
     848 *  Now account for any extra memory that initialization tasks or threads
     849 *  may have requested.
     850 */
     851
     852#ifdef RTEMS_POSIX_API
     853#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART \
     854    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
     855#else
     856#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART 0
     857#endif
     858#ifdef RTEMS_ITRON_API
     859#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART \
     860    (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
     861#else
     862#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART 0
     863#endif
     864
    847865#define CONFIGURE_INITIALIZATION_THREADS_STACKS \
    848866   ((CONFIGURE_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
    849     (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
    850     (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE))
     867    CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART + \
     868    CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART)
    851869
    852870#define CONFIGURE_EXECUTIVE_RAM_SIZE \
  • cpukit/sapi/ChangeLog

    r1fba44d r399c2e5d  
     12000-10-18      Joel Sherrill <joel@OARcorp.com>
     2
     3        * include/confdefs.h: Modified code that accounts for initialization
     4        task/threads with greater than minimum stack sizes so it would
     5        compile even if optional APIs are disabled.
     6
    172000-10-12      Joel Sherrill <joel@OARcorp.com>
    28
  • cpukit/sapi/include/confdefs.h

    r1fba44d r399c2e5d  
    713713   ( sizeof(ITRON_Fixed_memory_pool_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
    714714
    715 #ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZES
    716 #define CONFIGURE_ITRON_INIT_TASK_STACK_SIZES (RTEMS_MINIMUM_STACK_SIZE * 2)
     715#ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZE
     716#define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
    717717#endif
    718718
     
    734734    CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS( \
    735735        CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS ) + \
    736     CONFIGURE_ITRON_INIT_TASK_STACK_SIZES \
     736    CONFIGURE_ITRON_INIT_TASK_STACK_SIZE \
    737737   )
    738738
     
    845845  )
    846846
     847/*
     848 *  Now account for any extra memory that initialization tasks or threads
     849 *  may have requested.
     850 */
     851
     852#ifdef RTEMS_POSIX_API
     853#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART \
     854    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
     855#else
     856#define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART 0
     857#endif
     858#ifdef RTEMS_ITRON_API
     859#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART \
     860    (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE)
     861#else
     862#define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART 0
     863#endif
     864
    847865#define CONFIGURE_INITIALIZATION_THREADS_STACKS \
    848866   ((CONFIGURE_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
    849     (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE) + \
    850     (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - RTEMS_MINIMUM_STACK_SIZE))
     867    CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART + \
     868    CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART)
    851869
    852870#define CONFIGURE_EXECUTIVE_RAM_SIZE \
Note: See TracChangeset for help on using the changeset viewer.