Changeset d8ac087 in rtems for cpukit/sapi


Ignore:
Timestamp:
Jun 2, 2014, 12:42:18 PM (5 years ago)
Author:
Ralf Kirchner <ralf.kirchner@…>
Branches:
4.11, master
Children:
1fc2e960
Parents:
7c90670
git-author:
Ralf Kirchner <ralf.kirchner@…> (06/02/14 12:42:18)
git-committer:
Sebastian Huber <sebastian.huber@…> (06/02/14 13:47:09)
Message:

rtems: Avoid copy and paste in confdefs.h

Add and use CONFIGURE_POSIX_MUTEXES.
Add and use CONFIGURE_POSIX_CONDITION_VARIABLES.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/sapi/include/confdefs.h

    r7c90670 rd8ac087  
    21102110  #endif
    21112111
    2112   #define CONFIGURE_MEMORY_FOR_POSIX \
    2113     ( CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_MAXIMUM_POSIX_MUTEXES + \
    2114           CONFIGURE_MAXIMUM_GO_CHANNELS + CONFIGURE_GO_INIT_MUTEXES) + \
    2115       CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
    2116           CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES + \
    2117           CONFIGURE_MAXIMUM_GO_CHANNELS + CONFIGURE_GO_INIT_CONDITION_VARIABLES) + \
    2118       CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS( \
    2119           CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS ) + \
    2120       CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES( \
    2121           CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES ) + \
    2122       CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUE_DESCRIPTORS( \
    2123           CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUE_DESCRIPTORS ) + \
    2124       CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( \
    2125           CONFIGURE_MAXIMUM_POSIX_SEMAPHORES ) + \
    2126       CONFIGURE_MEMORY_FOR_POSIX_BARRIERS(CONFIGURE_MAXIMUM_POSIX_BARRIERS) + \
    2127       CONFIGURE_MEMORY_FOR_POSIX_SPINLOCKS( \
    2128           CONFIGURE_MAXIMUM_POSIX_SPINLOCKS ) + \
    2129       CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS( \
    2130           CONFIGURE_MAXIMUM_POSIX_RWLOCKS ) + \
    2131       CONFIGURE_MEMORY_FOR_POSIX_TIMERS( CONFIGURE_MAXIMUM_POSIX_TIMERS ) \
    2132      )
    21332112#else
    21342113
    21352114  #define CONFIGURE_MAXIMUM_POSIX_THREADS         0
    2136   #define CONFIGURE_MEMORY_FOR_POSIX              0
    21372115
    21382116#endif    /* RTEMS_POSIX_API */
     
    22252203     CONFIGURE_MAXIMUM_ADA_TASKS + \
    22262204     CONFIGURE_MAXIMUM_GOROUTINES)
     2205
     2206#ifdef RTEMS_POSIX_API
     2207  /**
     2208   * This macro provides summation of the POSIX Mutexes.
     2209   */
     2210  #define CONFIGURE_POSIX_MUTEXES \
     2211    (CONFIGURE_MAXIMUM_POSIX_MUTEXES + \
     2212      CONFIGURE_GNAT_MUTEXES + \
     2213      CONFIGURE_MAXIMUM_ADA_TASKS + \
     2214      CONFIGURE_MAXIMUM_FAKE_ADA_TASKS + \
     2215      CONFIGURE_GO_INIT_MUTEXES + \
     2216      CONFIGURE_MAXIMUM_GO_CHANNELS)
     2217
     2218  /**
     2219   * This macro provides summation of the POSIX Condition Variables.
     2220   */
     2221  #define CONFIGURE_POSIX_CONDITION_VARIABLES \
     2222    (CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES + \
     2223      CONFIGURE_MAXIMUM_ADA_TASKS + \
     2224      CONFIGURE_MAXIMUM_FAKE_ADA_TASKS + \
     2225      CONFIGURE_GO_INIT_CONDITION_VARIABLES + \
     2226      CONFIGURE_MAXIMUM_GO_CHANNELS)
     2227
     2228  #define CONFIGURE_MEMORY_FOR_POSIX \
     2229    (CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(CONFIGURE_POSIX_MUTEXES) + \
     2230      CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
     2231        CONFIGURE_POSIX_CONDITION_VARIABLES) + \
     2232      CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS( \
     2233        CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS) + \
     2234      CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES( \
     2235        CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES) + \
     2236      CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUE_DESCRIPTORS( \
     2237        CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUE_DESCRIPTORS) + \
     2238      CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( \
     2239        CONFIGURE_MAXIMUM_POSIX_SEMAPHORES) + \
     2240      CONFIGURE_MEMORY_FOR_POSIX_BARRIERS(CONFIGURE_MAXIMUM_POSIX_BARRIERS) + \
     2241      CONFIGURE_MEMORY_FOR_POSIX_SPINLOCKS( \
     2242        CONFIGURE_MAXIMUM_POSIX_SPINLOCKS) + \
     2243      CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS( \
     2244        CONFIGURE_MAXIMUM_POSIX_RWLOCKS) + \
     2245      CONFIGURE_MEMORY_FOR_POSIX_TIMERS(CONFIGURE_MAXIMUM_POSIX_TIMERS))
     2246#else
     2247  #define CONFIGURE_MEMORY_FOR_POSIX 0
     2248#endif
    22272249
    22282250/*
     
    25832605    posix_api_configuration_table Configuration_POSIX_API = {
    25842606      CONFIGURE_POSIX_THREADS,
    2585       CONFIGURE_MAXIMUM_POSIX_MUTEXES + CONFIGURE_GNAT_MUTEXES +
    2586         CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS +
    2587         CONFIGURE_GO_INIT_MUTEXES + CONFIGURE_MAXIMUM_GO_CHANNELS,
    2588       CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +
    2589         CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS +
    2590         CONFIGURE_GO_INIT_CONDITION_VARIABLES + CONFIGURE_MAXIMUM_GO_CHANNELS,
     2607      CONFIGURE_POSIX_MUTEXES,
     2608      CONFIGURE_POSIX_CONDITION_VARIABLES,
    25912609      CONFIGURE_MAXIMUM_POSIX_TIMERS,
    25922610      CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS,
     
    28232841#ifdef RTEMS_POSIX_API
    28242842    /* POSIX API Pieces */
    2825     CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_MAXIMUM_POSIX_MUTEXES +
    2826       CONFIGURE_MAXIMUM_GO_CHANNELS + CONFIGURE_GO_INIT_MUTEXES),
     2843    CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_POSIX_MUTEXES ),
    28272844    CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(
    2828       CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +
    2829       CONFIGURE_MAXIMUM_GO_CHANNELS + CONFIGURE_GO_INIT_CONDITION_VARIABLES),
     2845      CONFIGURE_POSIX_CONDITION_VARIABLES ),
    28302846    CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(
    28312847      CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS ),
Note: See TracChangeset for help on using the changeset viewer.