Changeset 659019e in rtems


Ignore:
Timestamp:
Jun 19, 2010, 11:39:56 PM (9 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
46e69ff
Parents:
ff71b7d8
Message:

2010-06-19 Joel Sherrill <joel.sherrilL@…>

  • sapi/include/confdefs.h: Add CONFIGURE_MAXIMUM_FIFOS to account for resources per FIFO instance.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rff71b7d8 r659019e  
     12010-06-19      Joel Sherrill <joel.sherrilL@OARcorp.com>
     2
     3        * sapi/include/confdefs.h: Add CONFIGURE_MAXIMUM_FIFOS to account for
     4        resources per FIFO instance.
     5
    162010-06-18      Ralf Corsépius <ralf.corsepius@rtems.org>
    27
  • cpukit/sapi/include/confdefs.h

    rff71b7d8 r659019e  
    289289
    290290/**
     291 *  It should be called FIFOs not pipes
     292 */
     293#if defined(CONFIGURE_PIPES_ENABLED)
     294  #define CONFIGURE_FIFOS_ENABLED
     295  #warning "Use CONFIGURE_FIFOS_ENABLED not CONFIGURE_PIPES_ENABLED"
     296#endif
     297
     298/**
    291299 *  This defines the IMFS file system table entry.
    292300 */
    293301#if !defined(CONFIGURE_FILESYSTEM_ENTRY_IMFS) && \
    294302    defined(CONFIGURE_FILESYSTEM_IMFS)
    295   #if defined(CONFIGURE_PIPES_ENABLED)
     303  #if defined(CONFIGURE_FIFOS_ENABLED)
    296304    #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
    297305      { RTEMS_FILESYSTEM_TYPE_IMFS, fifoIMFS_initialize }
     
    300308      { RTEMS_FILESYSTEM_TYPE_IMFS, IMFS_initialize }
    301309  #endif
     310#endif
     311
     312/**
     313 *  This sets up the resources for the PIPES/FIFOs
     314 */
     315#if defined(CONFIGURE_FIFOS_ENABLED)
     316  #if !defined(CONFIGURE_MAXIMUM_FIFOS)
     317    #error "FIFOs enabled but no FIFOs configured."
     318  #endif
     319  #define CONFIGURE_BARRIERS_FOR_FIFOS   (2 * CONFIGURE_MAXIMUM_FIFOS)
     320  #define CONFIGURE_SEMAPHORES_FOR_FIFOS (1 + CONFIGURE_MAXIMUM_FIFOS)
     321#else
     322  #define CONFIGURE_BARRIERS_FOR_FIFOS   0
     323  #define CONFIGURE_SEMAPHORES_FOR_FIFOS 0
    302324#endif
    303325
     
    11331155  #define CONFIGURE_SEMAPHORES \
    11341156    (CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES + \
    1135       CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES)
     1157      CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES + \
     1158      CONFIGURE_SEMAPHORES_FOR_FIFOS)
    11361159
    11371160  /*
     
    11881211  #ifndef CONFIGURE_MAXIMUM_BARRIERS
    11891212    #define CONFIGURE_MAXIMUM_BARRIERS               0
     1213  #endif
     1214
     1215  #define CONFIGURE_BARRIERS \
     1216     (CONFIGURE_MAXIMUM_BARRIERS + CONFIGURE_BARRIERS_FOR_FIFOS)
     1217
     1218  #if CONFIGURE_BARRIERS == 0
    11901219    #define CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) 0
    11911220  #else
     
    17281757   CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \
    17291758   CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \
    1730    CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_MAXIMUM_BARRIERS) + \
     1759   CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_BARRIERS) + \
    17311760   CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS) \
    17321761  )
     
    18091838    CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS),
    18101839    CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS),
    1811     CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_MAXIMUM_BARRIERS),
     1840    CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_BARRIERS),
    18121841    CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS),
    18131842
     
    18661895    CONFIGURE_MAXIMUM_PORTS,
    18671896    CONFIGURE_MAXIMUM_PERIODS,
    1868     CONFIGURE_MAXIMUM_BARRIERS,
     1897    CONFIGURE_BARRIERS,
    18691898    CONFIGURE_INIT_TASK_TABLE_SIZE,
    18701899    CONFIGURE_INIT_TASK_TABLE
Note: See TracChangeset for help on using the changeset viewer.