Changeset 94a88c1c in rtems


Ignore:
Timestamp:
Nov 24, 2008, 7:50:06 PM (11 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
1efc075
Parents:
ea5c9c6
Message:

2008-11-24 Joel Sherrill <joel.sherrill@…>

PR 1341/cpukit

  • sapi/include/confdefs.h: The following macros were missing the _Configure_From_workspace() wrapper on their size estimate: + CONFIGURE_INTERRUPT_STACK_MEMORY + CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API + CONFIGURE_INTERRUPT_VECTOR_TABLE + CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS In addition, there was a duplicate definition of CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rea5c9c6 r94a88c1c  
     12008-11-24      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        PR 1341/cpukit
     4        * sapi/include/confdefs.h: The following macros were missing
     5        the _Configure_From_workspace() wrapper on their size estimate:
     6          + CONFIGURE_INTERRUPT_STACK_MEMORY
     7          + CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API
     8          + CONFIGURE_INTERRUPT_VECTOR_TABLE
     9          + CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS
     10        In addition, there was a duplicate definition of
     11        CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API.
     12
    1132008-11-24      Ralf Corsépius <ralf.corsepius@rtems.org>
    214
  • cpukit/sapi/include/confdefs.h

    rea5c9c6 r94a88c1c  
    347347  #define CONFIGURE_INTERRUPT_STACK_MEMORY 0
    348348#else
    349   #define CONFIGURE_INTERRUPT_STACK_MEMORY CONFIGURE_INTERRUPT_STACK_SIZE
     349  #define CONFIGURE_INTERRUPT_STACK_MEMORY \
     350     _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE )
    350351#endif
    351352
     
    810811  #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS
    811812    #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    812       sizeof(RTEMS_API_Control)
     813      _Configure_From_workspace( sizeof(RTEMS_API_Control) )
    813814  #else
    814815    #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    815       (sizeof(RTEMS_API_Control) - (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t)))
     816      _Configure_From_workspace( sizeof(RTEMS_API_Control) - \
     817        (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t)))
    816818  #endif
    817819
     
    920922  #ifndef CONFIGURE_TICKS_PER_TIMESLICE
    921923    #define CONFIGURE_TICKS_PER_TIMESLICE        50
    922   #endif
    923 
    924   #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS
    925     #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    926       sizeof(RTEMS_API_Control)
    927   #else
    928     #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    929       (sizeof(RTEMS_API_Control) - (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t)))
    930924  #endif
    931925
     
    14871481   */
    14881482  #if defined(__mips__)
    1489     #define CONFIGURE_INTERRUPT_VECTOR_TABLE (sizeof(ISR_Handler_entry) * 256)
    1490   #else
    14911483    #define CONFIGURE_INTERRUPT_VECTOR_TABLE \
    1492       (sizeof(ISR_Handler_entry) * ISR_NUMBER_OF_VECTORS)
     1484      _Configure_From_workspace( (sizeof(ISR_Handler_entry) * 256))
     1485  #else
     1486    #define CONFIGURE_INTERRUPT_VECTOR_TABLE \
     1487      _Configure_From_workspace( \
     1488        (sizeof(ISR_Handler_entry) * ISR_NUMBER_OF_VECTORS))
    14931489  #endif
    14941490#else
     
    15931589 */
    15941590#define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \
    1595    _Configure_From_workspace( \
    1596      (CONFIGURE_NEWLIB_EXTENSION + CONFIGURE_STACK_CHECKER_EXTENSION) * \
    1597       sizeof(User_extensions_Control) \
    1598    )
     1591     ((CONFIGURE_NEWLIB_EXTENSION * \
     1592        _Configure_From_workspace( sizeof(User_extensions_Control))) + \
     1593      (CONFIGURE_STACK_CHECKER_EXTENSION * \
     1594        _Configure_From_workspace( sizeof(User_extensions_Control))) \
     1595     )
    15991596
    16001597/**
Note: See TracChangeset for help on using the changeset viewer.