Changeset b2f216e1 in rtems


Ignore:
Timestamp:
May 3, 2010, 9:13:36 AM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.10, 4.11, master
Children:
c1b2bac
Parents:
bd878476
Message:

2010-05-03 Sebastian Huber <sebastian.huber@…>

  • sapi/include/confdefs.h: New define CONFIGURE_SEMAPHORES for the overall count of required semaphores. New define CONFIGURE_LIBBLOCK_SEMAPHORES for the count of required disk and bdbuf semaphores.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rbd878476 rb2f216e1  
     12010-05-03      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * sapi/include/confdefs.h: New define CONFIGURE_SEMAPHORES for the
     4        overall count of required semaphores.  New define
     5        CONFIGURE_LIBBLOCK_SEMAPHORES for the count of required disk and bdbuf
     6        semaphores.
     7
    182010-05-01      Ralf Corsépius <ralf.corsepius@rtems.org>
    29
  • cpukit/sapi/include/confdefs.h

    rbd878476 rb2f216e1  
    785785    };
    786786  #endif
     787
     788  /*
     789   *  Semaphores:
     790   *    o disk lock
     791   *    o bdbuf lock
     792   *    o bdbuf sync lock
     793   *    o bdbuf access condition
     794   *    o bdbuf transfer condition
     795   *    o bdbuf buffer condition
     796   */
     797  #define CONFIGURE_LIBBLOCK_SEMAPHORES 6
     798
    787799  #if defined(CONFIGURE_HAS_OWN_BDBUF_TABLE) || \
    788800      defined(CONFIGURE_BDBUF_BUFFER_SIZE) || \
     
    790802    #error BDBUF Cache does not use a buffer configuration table. Please remove.
    791803  #endif
     804#else
     805  #define CONFIGURE_LIBBLOCK_SEMAPHORES 0
    792806#endif /* CONFIGURE_APPLICATION_NEEDS_LIBBLOCK */
    793807
     
    910924  #ifndef CONFIGURE_MAXIMUM_SEMAPHORES
    911925    #define CONFIGURE_MAXIMUM_SEMAPHORES                 0
    912   #else
    913   #endif
     926  #endif
     927
     928  #define CONFIGURE_SEMAPHORES \
     929    (CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES + \
     930      CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES)
    914931
    915932  /*
     
    917934   * that no memory need be allocated at all for semaphores.
    918935   */
    919   #if  ((CONFIGURE_MAXIMUM_SEMAPHORES == 0) && \
    920         (CONFIGURE_LIBIO_SEMAPHORES == 0) && \
    921         (CONFIGURE_TERMIOS_SEMAPHORES == 0))
     936  #if CONFIGURE_SEMAPHORES == 0
    922937    #define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) 0
    923938  #else
     
    16871702   CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS + \
    16881703    CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER ) + \
    1689    CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES + \
    1690      CONFIGURE_LIBIO_SEMAPHORES + CONFIGURE_TERMIOS_SEMAPHORES) + \
     1704   CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_SEMAPHORES) + \
    16911705   CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \
    16921706   CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \
     
    17811795    CONFIGURE_MEMORY_FOR_TASK_VARIABLES(CONFIGURE_MAXIMUM_TASK_VARIABLES),
    17821796    CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS),
    1783     CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES +
    1784        CONFIGURE_LIBIO_SEMAPHORES + CONFIGURE_TERMIOS_SEMAPHORES),
     1797    CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_SEMAPHORES),
    17851798    CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES),
    17861799    CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS),
     
    18541867    CONFIGURE_NOTEPADS_ENABLED,
    18551868    CONFIGURE_MAXIMUM_TIMERS + CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER,
    1856     CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES +
    1857       CONFIGURE_TERMIOS_SEMAPHORES,
     1869    CONFIGURE_SEMAPHORES,
    18581870    CONFIGURE_MAXIMUM_MESSAGE_QUEUES,
    18591871    CONFIGURE_MAXIMUM_PARTITIONS,
Note: See TracChangeset for help on using the changeset viewer.