Changeset 07d71279 in rtems


Ignore:
Timestamp:
Feb 1, 2017, 1:48:17 PM (3 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
239dd35f
Parents:
85ed95e
git-author:
Sebastian Huber <sebastian.huber@…> (02/01/17 13:48:17)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/03/17 10:14:58)
Message:

Prefix confdefs.h internal def with an underscore

Close #2895.

Files:
3 edited

Legend:

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

    r85ed95e r07d71279  
    5656#endif
    5757
     58/*
     59 * Internal defines must be prefixed with _CONFIGURE to distinguish them from
     60 * user-provided options which use a CONFIGURE prefix.
     61 */
     62
    5863/**
    5964 * @defgroup Configuration RTEMS Configuration
     
    108113
    109114#if (defined(RTEMS_NEWLIB) && !defined(CONFIGURE_DISABLE_NEWLIB_REENTRANCY))
    110   #define CONFIGURE_NEWLIB_EXTENSION 1
     115  #define _CONFIGURE_NEWLIB_EXTENSION 1
    111116#else
    112   #define CONFIGURE_NEWLIB_EXTENSION 0
     117  #define _CONFIGURE_NEWLIB_EXTENSION 0
    113118#endif
    114119
     
    136141#endif
    137142
    138 /**
     143/*
    139144 * Semaphore count used by the IO library.
    140145 */
    141 #define CONFIGURE_LIBIO_SEMAPHORES 1
    142 
    143 /**
     146#define _CONFIGURE_LIBIO_SEMAPHORES 1
     147
     148/*
    144149 * POSIX key count used by the IO library.
    145150 */
    146 #define CONFIGURE_LIBIO_POSIX_KEYS 1
    147 
    148 /**
     151#define _CONFIGURE_LIBIO_POSIX_KEYS 1
     152
     153/*
    149154 *  Driver Manager Configuration
    150155 */
    151156#ifdef RTEMS_DRVMGR_STARTUP
    152   #define CONFIGURE_DRVMGR_SEMAPHORES 1
     157  #define _CONFIGURE_DRVMGR_SEMAPHORES 1
    153158#else
    154   #define CONFIGURE_DRVMGR_SEMAPHORES 0
     159  #define _CONFIGURE_DRVMGR_SEMAPHORES 0
    155160#endif
    156161
     
    165170#endif
    166171
    167 /**
     172/*
    168173 * This macro determines if termios is disabled by this application.
    169174 * This only means that resources will not be reserved.  If you end
     
    171176 */
    172177#ifdef CONFIGURE_TERMIOS_DISABLED
    173   #define CONFIGURE_TERMIOS_SEMAPHORES 0
     178  #define _CONFIGURE_TERMIOS_SEMAPHORES 0
    174179#else
    175180  /**
     
    181186  #endif
    182187
    183   /**
     188  /*
    184189   * This macro reserves the number of semaphores required by termios
    185190   * based upon the number of communication ports that will use it.
    186191   */
    187   #define CONFIGURE_TERMIOS_SEMAPHORES \
     192  #define _CONFIGURE_TERMIOS_SEMAPHORES \
    188193    ((CONFIGURE_NUMBER_OF_TERMIOS_PORTS * 4) + 1)
    189194#endif
     
    241246#endif
    242247
    243 /**
     248/*
    244249 * This specifies the number of barriers required for the configured
    245250 * number of FIFOs and named pipes.
    246  *
    247  * This is an internal parameter.
    248251 */
    249252#if CONFIGURE_MAXIMUM_FIFOS > 0 || CONFIGURE_MAXIMUM_PIPES > 0
    250   #define CONFIGURE_BARRIERS_FOR_FIFOS \
     253  #define _CONFIGURE_BARRIERS_FOR_FIFOS \
    251254    (2 * (CONFIGURE_MAXIMUM_FIFOS + CONFIGURE_MAXIMUM_PIPES))
    252255#else
    253   #define CONFIGURE_BARRIERS_FOR_FIFOS   0
    254 #endif
    255 
    256 /**
     256  #define _CONFIGURE_BARRIERS_FOR_FIFOS   0
     257#endif
     258
     259/*
    257260 * This specifies the number of semaphores required for the configured
    258261 * number of FIFOs and named pipes.
    259  *
    260  * This is an internal parameter.
    261262 */
    262263#if CONFIGURE_MAXIMUM_FIFOS > 0 || CONFIGURE_MAXIMUM_PIPES > 0
    263   #define CONFIGURE_SEMAPHORES_FOR_FIFOS \
     264  #define _CONFIGURE_SEMAPHORES_FOR_FIFOS \
    264265    (1 + (CONFIGURE_MAXIMUM_FIFOS + CONFIGURE_MAXIMUM_PIPES))
    265266#else
    266   #define CONFIGURE_SEMAPHORES_FOR_FIFOS 0
     267  #define _CONFIGURE_SEMAPHORES_FOR_FIFOS 0
    267268#endif
    268269
     
    435436  #define CONFIGURE_FILESYSTEM_ENTRY_NFS \
    436437    { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfs_initialize }
    437   #define CONFIGURE_SEMAPHORES_FOR_NFS ((CONFIGURE_MAXIMUM_NFS_MOUNTS * 2) + 1)
     438  #define _CONFIGURE_SEMAPHORES_FOR_NFS ((CONFIGURE_MAXIMUM_NFS_MOUNTS * 2) + 1)
    438439#else
    439   #define CONFIGURE_SEMAPHORES_FOR_NFS 0
     440  #define _CONFIGURE_SEMAPHORES_FOR_NFS 0
    440441#endif
    441442
     
    451452  #define CONFIGURE_FILESYSTEM_ENTRY_DOSFS \
    452453    { RTEMS_FILESYSTEM_TYPE_DOSFS, rtems_dosfs_initialize }
    453   #define CONFIGURE_SEMAPHORES_FOR_DOSFS CONFIGURE_MAXIMUM_DOSFS_MOUNTS
     454  #define _CONFIGURE_SEMAPHORES_FOR_DOSFS CONFIGURE_MAXIMUM_DOSFS_MOUNTS
    454455#else
    455   #define CONFIGURE_SEMAPHORES_FOR_DOSFS 0
     456  #define _CONFIGURE_SEMAPHORES_FOR_DOSFS 0
    456457#endif
    457458
     
    467468  #define CONFIGURE_FILESYSTEM_ENTRY_RFS \
    468469    { RTEMS_FILESYSTEM_TYPE_RFS, rtems_rfs_rtems_initialise }
    469   #define CONFIGURE_SEMAPHORES_FOR_RFS CONFIGURE_MAXIMUM_RFS_MOUNTS
     470  #define _CONFIGURE_SEMAPHORES_FOR_RFS CONFIGURE_MAXIMUM_RFS_MOUNTS
    470471#else
    471   #define CONFIGURE_SEMAPHORES_FOR_RFS 0
     472  #define _CONFIGURE_SEMAPHORES_FOR_RFS 0
    472473#endif
    473474
     
    483484  #define CONFIGURE_FILESYSTEM_ENTRY_JFFS2 \
    484485    { RTEMS_FILESYSTEM_TYPE_JFFS2, rtems_jffs2_initialize }
    485   #define CONFIGURE_SEMAPHORES_FOR_JFFS2 CONFIGURE_MAXIMUM_JFFS2_MOUNTS
     486  #define _CONFIGURE_SEMAPHORES_FOR_JFFS2 CONFIGURE_MAXIMUM_JFFS2_MOUNTS
    486487#else
    487   #define CONFIGURE_SEMAPHORES_FOR_JFFS2 0
     488  #define _CONFIGURE_SEMAPHORES_FOR_JFFS2 0
    488489#endif
    489490
     
    491492 * This computes the number of semaphores required for the various
    492493 * file systems including the FIFO plugin to the IMFS.
    493  *
    494  * This is an internal parameter.
    495  */
    496 #define CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS \
    497     (CONFIGURE_SEMAPHORES_FOR_FIFOS + \
    498      CONFIGURE_SEMAPHORES_FOR_NFS + \
    499      CONFIGURE_SEMAPHORES_FOR_DOSFS + \
    500      CONFIGURE_SEMAPHORES_FOR_RFS + \
    501      CONFIGURE_SEMAPHORES_FOR_JFFS2)
     494 */
     495#define _CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS \
     496    (_CONFIGURE_SEMAPHORES_FOR_FIFOS + \
     497     _CONFIGURE_SEMAPHORES_FOR_NFS + \
     498     _CONFIGURE_SEMAPHORES_FOR_DOSFS + \
     499     _CONFIGURE_SEMAPHORES_FOR_RFS + \
     500     _CONFIGURE_SEMAPHORES_FOR_JFFS2)
    502501
    503502#ifdef CONFIGURE_INIT
     
    718717 */
    719718#ifdef CONFIGURE_STACK_CHECKER_ENABLED
    720   #define CONFIGURE_STACK_CHECKER_EXTENSION 1
     719  #define _CONFIGURE_STACK_CHECKER_EXTENSION 1
    721720#else
    722   #define CONFIGURE_STACK_CHECKER_EXTENSION 0
     721  #define _CONFIGURE_STACK_CHECKER_EXTENSION 0
    723722#endif
    724723
     
    10251024        CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS
    10261025      #else
    1027         #define CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT \
     1026        #define _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT \
    10281027          RTEMS_SCHEDULER_ASSIGN( \
    10291028            0, \
    10301029            RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL \
    10311030          )
    1032         CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1031        _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10331032        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 2
    1034           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1033          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10351034        #endif
    10361035        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 3
    1037           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1036          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10381037        #endif
    10391038        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 4
    1040           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1039          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10411040        #endif
    10421041        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 5
    1043           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1042          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10441043        #endif
    10451044        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 6
    1046           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1045          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10471046        #endif
    10481047        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 7
    1049           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1048          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10501049        #endif
    10511050        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 8
    1052           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1051          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10531052        #endif
    10541053        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 9
    1055           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1054          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10561055        #endif
    10571056        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 10
    1058           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1057          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10591058        #endif
    10601059        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 11
    1061           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1060          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10621061        #endif
    10631062        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 12
    1064           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1063          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10651064        #endif
    10661065        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 13
    1067           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1066          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10681067        #endif
    10691068        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 14
    1070           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1069          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10711070        #endif
    10721071        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 15
    1073           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1072          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10741073        #endif
    10751074        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 16
    1076           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1075          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10771076        #endif
    10781077        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 17
    1079           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1078          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10801079        #endif
    10811080        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 18
    1082           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1081          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10831082        #endif
    10841083        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 19
    1085           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1084          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10861085        #endif
    10871086        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 20
    1088           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1087          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10891088        #endif
    10901089        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 21
    1091           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1090          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10921091        #endif
    10931092        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 22
    1094           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1093          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10951094        #endif
    10961095        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 23
    1097           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1096          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    10981097        #endif
    10991098        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 24
    1100           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1099          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11011100        #endif
    11021101        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 25
    1103           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1102          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11041103        #endif
    11051104        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 26
    1106           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1105          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11071106        #endif
    11081107        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 27
    1109           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1108          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11101109        #endif
    11111110        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 28
    1112           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1111          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11131112        #endif
    11141113        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 29
    1115           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1114          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11161115        #endif
    11171116        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 30
    1118           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1117          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11191118        #endif
    11201119        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 31
    1121           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1120          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11221121        #endif
    11231122        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 32
    1124           , CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    1125         #endif
    1126         #undef CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1123          , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
     1124        #endif
     1125        #undef _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
    11271126      #endif
    11281127    };
     
    12441243 */
    12451244#if (CPU_ALLOCATE_INTERRUPT_STACK == 0)
    1246   #define CONFIGURE_INTERRUPT_STACK_MEMORY 0
     1245  #define _CONFIGURE_INTERRUPT_STACK_MEMORY 0
    12471246#else
    1248   #define CONFIGURE_INTERRUPT_STACK_MEMORY \
     1247  #define _CONFIGURE_INTERRUPT_STACK_MEMORY \
    12491248     _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE )
    12501249#endif
     
    13721371  (((_val) + (_align) - 1) - ((_val) + (_align) - 1) % (_align))
    13731372
    1374 #define CONFIGURE_HEAP_MIN_BLOCK_SIZE \
     1373#define _CONFIGURE_HEAP_MIN_BLOCK_SIZE \
    13751374  _Configure_Align_up(sizeof(Heap_Block), CPU_HEAP_ALIGNMENT)
    13761375
     
    13841383  (ssize_t) (_Configure_Zero_or_One(_size) * \
    13851384    _Configure_Align_up(_size + HEAP_BLOCK_HEADER_SIZE, \
    1386       CONFIGURE_HEAP_MIN_BLOCK_SIZE))
     1385      _CONFIGURE_HEAP_MIN_BLOCK_SIZE))
    13871386
    13881387/**
     
    15311530/**
    15321531 * This is the name of the Initialization Tasks Table generated.
    1533  *
    1534  * This is an internal parameter.
    15351532 */
    15361533#define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
    15371534
    1538 /**
     1535/*
    15391536 * This is the size of the Initialization Tasks Table generated.
    1540  *
    1541  * This is an internal parameter.
    15421537 */
    15431538#define CONFIGURE_INIT_TASK_TABLE_SIZE \
     
    15481543#else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
    15491544
    1550 /**
     1545/*
    15511546 * This is the name of the Initialization Task when none is configured.
    1552  *
    1553  * This is an internal parameter.
    15541547 */
    15551548#define CONFIGURE_INIT_TASK_TABLE      NULL
    15561549
    1557 /**
     1550/*
    15581551 * This is the size of the Initialization Task when none is configured.
    1559  *
    1560  * This is an internal parameter.
    15611552 */
    15621553#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
    15631554
    1564 /**
     1555/*
    15651556 * This is the stack size of the Initialization Task when none is configured.
    1566  *
    1567  * This is an internal parameter.
    15681557 */
    15691558#define CONFIGURE_INIT_TASK_STACK_SIZE 0
     
    18001789  #endif
    18011790
    1802   #define CONFIGURE_LIBBLOCK_TASKS \
     1791  #define _CONFIGURE_LIBBLOCK_TASKS \
    18031792    (1 + CONFIGURE_SWAPOUT_WORKER_TASKS + \
    18041793    (CONFIGURE_BDBUF_MAX_READ_AHEAD_BLOCKS != 0))
    18051794
    1806   #define CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS \
    1807     (CONFIGURE_LIBBLOCK_TASKS * \
     1795  #define _CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS \
     1796    (_CONFIGURE_LIBBLOCK_TASKS * \
    18081797    (CONFIGURE_BDBUF_TASK_STACK_SIZE <= CONFIGURE_MINIMUM_TASK_STACK_SIZE ? \
    18091798    0 : CONFIGURE_BDBUF_TASK_STACK_SIZE - CONFIGURE_MINIMUM_TASK_STACK_SIZE))
     
    18141803     *   o disk lock
    18151804     */
    1816     #define CONFIGURE_LIBBLOCK_SEMAPHORES 1
     1805    #define _CONFIGURE_LIBBLOCK_SEMAPHORES 1
    18171806
    18181807    /*
     
    18211810     *  o bdbuf sync lock
    18221811     */
    1823     #define CONFIGURE_LIBBLOCK_POSIX_MUTEXES 2
     1812    #define _CONFIGURE_LIBBLOCK_POSIX_MUTEXES 2
    18241813
    18251814    /*
     
    18291818     *  o bdbuf buffer condition
    18301819     */
    1831     #define CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES 3
     1820    #define _CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES 3
    18321821  #else
    18331822    /*
     
    18401829     *   o bdbuf buffer condition
    18411830     */
    1842     #define CONFIGURE_LIBBLOCK_SEMAPHORES 6
    1843 
    1844     #define CONFIGURE_LIBBLOCK_POSIX_MUTEXES 0
    1845     #define CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES 0
     1831    #define _CONFIGURE_LIBBLOCK_SEMAPHORES 6
     1832
     1833    #define _CONFIGURE_LIBBLOCK_POSIX_MUTEXES 0
     1834    #define _CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES 0
    18461835  #endif
    18471836
     
    18531842#else
    18541843  /** This specifies the number of libblock tasks. */
    1855   #define CONFIGURE_LIBBLOCK_TASKS 0
     1844  #define _CONFIGURE_LIBBLOCK_TASKS 0
    18561845  /** This specifies the extra stack space configured for libblock tasks. */
    1857   #define CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS 0
     1846  #define _CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS 0
    18581847  /** This specifies the number of Classic API semaphores needed by libblock. */
    1859   #define CONFIGURE_LIBBLOCK_SEMAPHORES 0
     1848  #define _CONFIGURE_LIBBLOCK_SEMAPHORES 0
    18601849  /** This specifies the number of POSIX Mutexes needed by libblock. */
    1861   #define CONFIGURE_LIBBLOCK_POSIX_MUTEXES 0
     1850  #define _CONFIGURE_LIBBLOCK_POSIX_MUTEXES 0
    18621851  /**
    18631852   * This specifies the number of POSIX Condition Variables needed
    18641853   * by libblock.
    18651854   */
    1866   #define CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES 0
     1855  #define _CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES 0
    18671856#endif /* CONFIGURE_APPLICATION_NEEDS_LIBBLOCK */
    18681857/**@}*/
     
    18931882 * a multiprocessing configuration.
    18941883 */
    1895 #ifndef CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER
    1896   #define CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
     1884#ifndef _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER
     1885  #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
    18971886#endif
    18981887
     
    19061895
    19071896  #ifdef CONFIGURE_MP_APPLICATION
    1908     #define CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 1
     1897    #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 1
    19091898
    19101899    #ifndef CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE
     
    19211910        #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     32
    19221911      #endif
    1923       #define CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(_global_objects) \
     1912      #define _CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(_global_objects) \
    19241913        _Configure_From_workspace( \
    19251914          (_global_objects) * sizeof(Objects_MP_Control) \
     
    19291918        #define CONFIGURE_MP_MAXIMUM_PROXIES            32
    19301919      #endif
    1931       #define CONFIGURE_MEMORY_FOR_PROXIES(_proxies) \
     1920      #define _CONFIGURE_MEMORY_FOR_PROXIES(_proxies) \
    19321921        _Configure_From_workspace((_proxies) \
    19331922          * (sizeof(Thread_Proxy_control) \
     
    19521941      #define CONFIGURE_MULTIPROCESSING_TABLE    &Multiprocessing_configuration
    19531942
    1954       #define CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1
     1943      #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1
    19551944
    19561945    #endif /* CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE */
     
    19601949    #define CONFIGURE_MULTIPROCESSING_TABLE    NULL
    19611950
    1962     #define CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
     1951    #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
    19631952
    19641953  #endif /* CONFIGURE_MP_APPLICATION */
    19651954#else
    1966   #define CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
     1955  #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
    19671956#endif /* RTEMS_MULTIPROCESSING */
    19681957/**@}*/ /* end of Multiprocessing Configuration */
     
    20942083  #endif
    20952084
    2096   /**
     2085  /*
    20972086   * This is calculated to account for the maximum number of Classic API
    20982087   * tasks used by the application and configured RTEMS capabilities.
    2099    *
    2100    * This is an internal parameter.
    2101    */
    2102   #define CONFIGURE_TASKS \
    2103     (CONFIGURE_MAXIMUM_TASKS + CONFIGURE_LIBBLOCK_TASKS)
     2088   */
     2089  #define _CONFIGURE_TASKS \
     2090    (CONFIGURE_MAXIMUM_TASKS + _CONFIGURE_LIBBLOCK_TASKS)
    21042091
    21052092  #ifndef CONFIGURE_MAXIMUM_TIMERS
    21062093    /** This specifies the maximum number of Classic API timers. */
    21072094    #define CONFIGURE_MAXIMUM_TIMERS             0
    2108     /**
     2095    /*
    21092096     * This macro is calculated to specify the memory required for
    21102097     * Classic API timers.
    2111      *
    2112      * This is an internal parameter.
    21132098     */
    2114     #define CONFIGURE_MEMORY_FOR_TIMERS(_timers) 0
     2099    #define _CONFIGURE_MEMORY_FOR_TIMERS(_timers) 0
    21152100  #else
    2116     #define CONFIGURE_MEMORY_FOR_TIMERS(_timers) \
     2101    #define _CONFIGURE_MEMORY_FOR_TIMERS(_timers) \
    21172102      _Configure_Object_RAM(_timers, sizeof(Timer_Control) )
    21182103  #endif
     
    21232108  #endif
    21242109
    2125   /**
     2110  /*
    21262111   * This specifies the number of Classic API semaphores required
    2127    *
    2128    * This is an internal parameter.
    21292112   */
    21302113  #ifdef RTEMS_NETWORKING
    2131     #define CONFIGURE_NETWORKING_SEMAPHORES 1
     2114    #define _CONFIGURE_NETWORKING_SEMAPHORES 1
    21322115  #else
    2133     #define CONFIGURE_NETWORKING_SEMAPHORES 0
    2134   #endif
    2135 
    2136   /**
     2116    #define _CONFIGURE_NETWORKING_SEMAPHORES 0
     2117  #endif
     2118
     2119  /*
    21372120   * This macro is calculated to specify the number of Classic API
    21382121   * semaphores required by the application and configured RTEMS
    21392122   * capabilities.
    2140    *
    2141    * This is an internal parameter.
    2142    */
    2143   #define CONFIGURE_SEMAPHORES \
    2144     (CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES + \
    2145       CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES + \
    2146       CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS + \
    2147       CONFIGURE_NETWORKING_SEMAPHORES + CONFIGURE_DRVMGR_SEMAPHORES)
    2148 
    2149   /**
     2123   */
     2124  #define _CONFIGURE_SEMAPHORES \
     2125    (CONFIGURE_MAXIMUM_SEMAPHORES + _CONFIGURE_LIBIO_SEMAPHORES + \
     2126      _CONFIGURE_TERMIOS_SEMAPHORES + _CONFIGURE_LIBBLOCK_SEMAPHORES + \
     2127      _CONFIGURE_SEMAPHORES_FOR_FILE_SYSTEMS + \
     2128      _CONFIGURE_NETWORKING_SEMAPHORES + _CONFIGURE_DRVMGR_SEMAPHORES)
     2129
     2130  /*
    21502131   * This macro is calculated to specify the memory required for
    21512132   * Classic API Semaphores using MRSP. This is only available in
    21522133   * SMP configurations.
    2153    *
    2154    * This is an internal parameter.
    21552134   */
    21562135  #if !defined(RTEMS_SMP) || \
    21572136    !defined(CONFIGURE_MAXIMUM_MRSP_SEMAPHORES)
    2158     #define CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES 0
     2137    #define _CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES 0
    21592138  #else
    2160     #define CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES \
     2139    #define _CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES \
    21612140      CONFIGURE_MAXIMUM_MRSP_SEMAPHORES * \
    21622141        _Configure_From_workspace( \
     
    21652144  #endif
    21662145
    2167   /**
     2146  /*
    21682147   * This macro is calculated to specify the memory required for
    21692148   * Classic API Semaphores.
     
    21712150   * If there are no user or support semaphores defined, then we can assume
    21722151   * that no memory need be allocated at all for semaphores.
    2173    *
    2174    * This is an internal parameter.
    2175    */
    2176   #if CONFIGURE_SEMAPHORES == 0
    2177     #define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) 0
     2152   */
     2153  #if _CONFIGURE_SEMAPHORES == 0
     2154    #define _CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) 0
    21782155  #else
    2179     #define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) \
     2156    #define _CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) \
    21802157      _Configure_Object_RAM(_semaphores, sizeof(Semaphore_Control) ) + \
    2181         CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES
     2158        _CONFIGURE_MEMORY_FOR_MRSP_SEMAPHORES
    21822159  #endif
    21832160
     
    21882165     */
    21892166    #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES             0
    2190     /**
     2167    /*
    21912168     * This macro is calculated to specify the RTEMS Workspace required for
    21922169     * the Classic API Message Queues.
    2193      *
    2194      * This is an internal parameter.
    21952170     */
    2196     #define CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(_queues) 0
     2171    #define _CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(_queues) 0
    21972172  #else
    2198     #define CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(_queues) \
     2173    #define _CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(_queues) \
    21992174      _Configure_Object_RAM(_queues, sizeof(Message_queue_Control) )
    22002175  #endif
     
    22062181     */
    22072182    #define CONFIGURE_MAXIMUM_PARTITIONS                 0
    2208     /**
     2183    /*
    22092184     * This macro is calculated to specify the memory required for
    22102185     * Classic API
    2211      *
    2212      * This is an internal parameter.
    22132186     */
    2214     #define CONFIGURE_MEMORY_FOR_PARTITIONS(_partitions) 0
     2187    #define _CONFIGURE_MEMORY_FOR_PARTITIONS(_partitions) 0
    22152188  #else
    2216     #define CONFIGURE_MEMORY_FOR_PARTITIONS(_partitions) \
     2189    #define _CONFIGURE_MEMORY_FOR_PARTITIONS(_partitions) \
    22172190      _Configure_Object_RAM(_partitions, sizeof(Partition_Control) )
    22182191  #endif
     
    22242197     */
    22252198    #define CONFIGURE_MAXIMUM_REGIONS              0
    2226     /**
     2199    /*
    22272200     * This macro is calculated to specify the memory required for
    22282201     * Classic API Regions.
    2229      *
    2230      * This is an internal parameter.
    22312202     */
    2232     #define CONFIGURE_MEMORY_FOR_REGIONS(_regions) 0
     2203    #define _CONFIGURE_MEMORY_FOR_REGIONS(_regions) 0
    22332204  #else
    2234     #define CONFIGURE_MEMORY_FOR_REGIONS(_regions) \
     2205    #define _CONFIGURE_MEMORY_FOR_REGIONS(_regions) \
    22352206      _Configure_Object_RAM(_regions, sizeof(Region_Control) )
    22362207  #endif
     
    22452216     * This macro is calculated to specify the memory required for
    22462217     * Classic API Dual-Ported Memory Ports.
    2247      *
    2248      * This is an internal parameter.
    22492218     */
    2250     #define CONFIGURE_MEMORY_FOR_PORTS(_ports) 0
     2219    #define _CONFIGURE_MEMORY_FOR_PORTS(_ports) 0
    22512220  #else
    2252     #define CONFIGURE_MEMORY_FOR_PORTS(_ports) \
     2221    #define _CONFIGURE_MEMORY_FOR_PORTS(_ports) \
    22532222      _Configure_Object_RAM(_ports, sizeof(Dual_ported_memory_Control) )
    22542223  #endif
     
    22602229     */
    22612230    #define CONFIGURE_MAXIMUM_PERIODS              0
    2262     /**
     2231    /*
    22632232     * This macro is calculated to specify the memory required for
    22642233     * Classic API Rate Monotonic Periods.
    2265      *
    2266      * This is an internal parameter.
    22672234     */
    2268   #define CONFIGURE_MEMORY_FOR_PERIODS(_periods) 0
     2235  #define _CONFIGURE_MEMORY_FOR_PERIODS(_periods) 0
    22692236#else
    2270     #define CONFIGURE_MEMORY_FOR_PERIODS(_periods) \
     2237    #define _CONFIGURE_MEMORY_FOR_PERIODS(_periods) \
    22712238      _Configure_Object_RAM(_periods, sizeof(Rate_monotonic_Control) )
    22722239  #endif
     
    22802247  #endif
    22812248
    2282   /**
     2249  /*
    22832250   * This macro is calculated to specify the number of Classic API
    22842251   * Barriers required by the application and configured capabilities.
    2285    *
    2286    * This is an internal parameter.
    2287    */
    2288   #define CONFIGURE_BARRIERS \
    2289      (CONFIGURE_MAXIMUM_BARRIERS + CONFIGURE_BARRIERS_FOR_FIFOS)
    2290 
    2291   /**
     2252   */
     2253  #define _CONFIGURE_BARRIERS \
     2254     (CONFIGURE_MAXIMUM_BARRIERS + _CONFIGURE_BARRIERS_FOR_FIFOS)
     2255
     2256  /*
    22922257   * This macro is calculated to specify the memory required for
    22932258   * Classic API Barriers.
    2294    *
    2295    * This is an internal parameter.
    2296    */
    2297   #if CONFIGURE_BARRIERS == 0
    2298     #define CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) 0
     2259   */
     2260  #if _CONFIGURE_BARRIERS == 0
     2261    #define _CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) 0
    22992262  #else
    2300     #define CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) \
     2263    #define _CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) \
    23012264      _Configure_Object_RAM(_barriers, sizeof(Barrier_Control) )
    23022265  #endif
     
    23082271     */
    23092272    #define CONFIGURE_MAXIMUM_USER_EXTENSIONS                 0
    2310     /**
     2273    /*
    23112274     * This macro is calculated to specify the memory required for
    23122275     * Classic API User Extensions.
    2313      *
    2314      * This is an internal parameter.
    23152276     */
    2316     #define CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(_extensions) 0
     2277    #define _CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(_extensions) 0
    23172278  #else
    2318     #define CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(_extensions) \
     2279    #define _CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(_extensions) \
    23192280      _Configure_Object_RAM(_extensions, sizeof(Extension_Control) )
    23202281  #endif
     
    23742335
    23752336  #define CONFIGURE_INITIAL_EXTENSION_TABLE Configuration_Initial_Extensions
    2376   #define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
     2337  #define _CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
    23772338    RTEMS_ARRAY_SIZE(Configuration_Initial_Extensions)
    23782339
     
    23842345#else
    23852346  #define CONFIGURE_INITIAL_EXTENSION_TABLE NULL
    2386   #define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS 0
     2347  #define _CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS 0
    23872348#endif
    23882349
     
    24202381#endif
    24212382
    2422 /**
     2383/*
    24232384 * This macro is calculated to specify the memory required for
    24242385 * POSIX API key/value pairs.
    2425  *
    2426  * This is an internal parameter.
    24272386 */
    24282387#ifndef CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS
     
    24322391#endif
    24332392
    2434 /**
     2393/*
    24352394 * This macro is calculated to specify the total number of
    24362395 * POSIX API keys required by the application and configured
    24372396 * system capabilities.
    2438  *
    2439  * This is an internal parameter.
    2440  */
    2441 #define CONFIGURE_POSIX_KEYS \
    2442   (CONFIGURE_MAXIMUM_POSIX_KEYS + CONFIGURE_LIBIO_POSIX_KEYS)
    2443 
    2444 /**
     2397 */
     2398#define _CONFIGURE_POSIX_KEYS \
     2399  (CONFIGURE_MAXIMUM_POSIX_KEYS + _CONFIGURE_LIBIO_POSIX_KEYS)
     2400
     2401/*
    24452402 * This macro is calculated to specify the memory required for
    24462403 * POSIX API keys.
    2447  *
    2448  * This is an internal parameter.
    2449  */
    2450 #define CONFIGURE_MEMORY_FOR_POSIX_KEYS(_keys, _key_value_pairs) \
     2404 */
     2405#define _CONFIGURE_MEMORY_FOR_POSIX_KEYS(_keys, _key_value_pairs) \
    24512406   (_Configure_Object_RAM(_keys, sizeof(POSIX_Keys_Control) ) \
    24522407    + _Configure_From_workspace( \
     
    24742429  #include <rtems/posix/timer.h>
    24752430
    2476   /**
     2431  /*
    24772432   * Account for the object control structures plus the name
    24782433   * of the object to be duplicated.
    2479    *
    2480    * This is an internal macro.
    24812434   */
    24822435  #define _Configure_POSIX_Named_Object_RAM(_number, _size) \
     
    25012454  #endif
    25022455
    2503   /**
     2456  /*
    25042457   * This macro is calculated to specify the memory required for
    25052458   * POSIX API mutexes.
    2506    *
    2507    * This is an internal parameter.
    2508    */
    2509   #define CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(_mutexes) \
     2459   */
     2460  #define _CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(_mutexes) \
    25102461    _Configure_Object_RAM(_mutexes, sizeof(POSIX_Mutex_Control) )
    25112462
     
    25182469  #endif
    25192470
    2520   /**
     2471  /*
    25212472   * This macro is calculated to specify the memory required for
    25222473   * POSIX API condition variables.
    2523    *
    2524    * This is an internal parameter.
    2525    */
    2526   #define CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(_condvars) \
     2474   */
     2475  #define _CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(_condvars) \
    25272476      _Configure_Object_RAM(_condvars, \
    25282477                          sizeof(POSIX_Condition_variables_Control) )
     
    25362485  #endif
    25372486
    2538   /**
     2487  /*
    25392488   * This macro is calculated to specify the memory required for
    25402489   * POSIX API timers.
    2541    *
    2542    * This is an internal parameter.
    2543    */
    2544   #define CONFIGURE_MEMORY_FOR_POSIX_TIMERS(_timers) \
     2490   */
     2491  #define _CONFIGURE_MEMORY_FOR_POSIX_TIMERS(_timers) \
    25452492    _Configure_Object_RAM(_timers, sizeof(POSIX_Timer_Control) )
    25462493
     
    25532500  #endif
    25542501
    2555   /**
     2502  /*
    25562503   * This macro is calculated to specify the memory required for
    25572504   * POSIX API queued signals.
    2558    *
    2559    * This is an internal parameter.
    2560    */
    2561   #define CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(_queued_signals) \
     2505   */
     2506  #define _CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(_queued_signals) \
    25622507    _Configure_From_workspace( \
    25632508      (_queued_signals) * (sizeof(POSIX_signals_Siginfo_node)) )
     
    25712516  #endif
    25722517
    2573   /**
     2518  /*
    25742519   * This macro is calculated to specify the memory required for
    25752520   * POSIX API message queues.
    2576    *
    2577    * This is an internal parameter.
    2578    */
    2579   #define CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES(_message_queues) \
     2521   */
     2522  #define _CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES(_message_queues) \
    25802523    _Configure_POSIX_Named_Object_RAM( \
    25812524       _message_queues, sizeof(POSIX_Message_queue_Control) )
     
    25892532  #endif
    25902533
    2591   /**
     2534  /*
    25922535   * This macro is calculated to specify the memory required for
    25932536   * POSIX API semaphores.
    2594    *
    2595    * This is an internal parameter.
    2596    */
    2597   #define CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES(_semaphores) \
     2537   */
     2538  #define _CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES(_semaphores) \
    25982539    _Configure_POSIX_Named_Object_RAM( \
    25992540       _semaphores, sizeof(POSIX_Semaphore_Control) )
     
    26072548  #endif
    26082549
    2609   /**
     2550  /*
    26102551   * This macro is calculated to specify the memory required for
    26112552   * POSIX API barriers.
    2612    *
    2613    * This is an internal parameter.
    2614    */
    2615   #define CONFIGURE_MEMORY_FOR_POSIX_BARRIERS(_barriers) \
     2553   */
     2554  #define _CONFIGURE_MEMORY_FOR_POSIX_BARRIERS(_barriers) \
    26162555    _Configure_Object_RAM(_barriers, sizeof(POSIX_Barrier_Control) )
    26172556
     
    26242563  #endif
    26252564
    2626   /**
     2565  /*
    26272566   * This macro is calculated to specify the memory required for
    26282567   * POSIX API rwlocks.
    2629    *
    2630    * This is an internal parameter.
    2631    */
    2632   #define CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS(_rwlocks) \
     2568   */
     2569  #define _CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS(_rwlocks) \
    26332570    _Configure_Object_RAM(_rwlocks, sizeof(POSIX_RWLock_Control) )
    26342571
     
    26512588  #endif
    26522589
    2653   /**
     2590  /*
    26542591   * This macro is calculated to specify the memory required for
    26552592   * POSIX API shared memory.
    2656    *
    2657    * This is an internal parameter.
    2658    */
    2659   #define CONFIGURE_MEMORY_FOR_POSIX_SHMS(_shms) \
     2593   */
     2594  #define _CONFIGURE_MEMORY_FOR_POSIX_SHMS(_shms) \
    26602595    _Configure_POSIX_Named_Object_RAM(_shms, sizeof(POSIX_Shm_Control) )
    26612596
     
    27372672   * We may be able to get by with less but why bother.
    27382673   */
    2739   #define CONFIGURE_GNAT_MUTEXES 10
     2674  #define _CONFIGURE_GNAT_MUTEXES 10
    27402675
    27412676  /**
     
    27572692#else
    27582693  /** This defines he number of POSIX mutexes GNAT needs. */
    2759   #define CONFIGURE_GNAT_MUTEXES           0
     2694  #define _CONFIGURE_GNAT_MUTEXES          0
    27602695  /** This defines he number of Ada tasks needed by the application. */
    27612696  #define CONFIGURE_MAXIMUM_ADA_TASKS      0
     
    27892724  #endif
    27902725
    2791   #define CONFIGURE_GO_INIT_MUTEXES 77
    2792   #define CONFIGURE_GO_INIT_CONDITION_VARIABLES 4
     2726  #define _CONFIGURE_GO_INIT_MUTEXES 77
     2727  #define _CONFIGURE_GO_INIT_CONDITION_VARIABLES 4
    27932728
    27942729  #ifndef CONFIGURE_MAXIMUM_GOROUTINES
     
    28012736
    28022737#else
    2803   /**
     2738  /*
    28042739   * This specifies the number of mutexes required by the Go run-time
    28052740   * for its own use.
    2806    *
    2807    * This is an internal parameter.
    2808    */
    2809   #define CONFIGURE_GO_INIT_MUTEXES             0
    2810 
    2811   /**
     2741   */
     2742  #define _CONFIGURE_GO_INIT_MUTEXES             0
     2743
     2744  /*
    28122745   * This specifies the number of condition variables required by the Go
    28132746   * run-time for its own use.
    2814    *
    2815    * This is an internal parameter.
    2816    */
    2817   #define CONFIGURE_GO_INIT_CONDITION_VARIABLES 0
     2747   */
     2748  #define _CONFIGURE_GO_INIT_CONDITION_VARIABLES 0
    28182749
    28192750  /** This specifies the maximum number of Go co-routines. */
     
    28362767 * This macro provides a summation of the various POSIX thread requirements.
    28372768 */
    2838 #define CONFIGURE_POSIX_THREADS \
     2769#define _CONFIGURE_POSIX_THREADS \
    28392770   (CONFIGURE_MAXIMUM_POSIX_THREADS + \
    28402771     CONFIGURE_MAXIMUM_ADA_TASKS + \
     
    28452776   * This macro provides summation of the POSIX Mutexes.
    28462777   */
    2847   #define CONFIGURE_POSIX_MUTEXES \
     2778  #define _CONFIGURE_POSIX_MUTEXES \
    28482779    (CONFIGURE_MAXIMUM_POSIX_MUTEXES + \
    2849       CONFIGURE_LIBBLOCK_POSIX_MUTEXES + \
    2850       CONFIGURE_GNAT_MUTEXES + \
     2780      _CONFIGURE_LIBBLOCK_POSIX_MUTEXES + \
     2781      _CONFIGURE_GNAT_MUTEXES + \
    28512782      CONFIGURE_MAXIMUM_ADA_TASKS + \
    28522783      CONFIGURE_MAXIMUM_FAKE_ADA_TASKS + \
    2853       CONFIGURE_GO_INIT_MUTEXES + \
     2784      _CONFIGURE_GO_INIT_MUTEXES + \
    28542785      CONFIGURE_MAXIMUM_GO_CHANNELS)
    28552786
    2856   /**
     2787  /*
    28572788   * This macro provides summation of the POSIX Condition Variables.
    2858    *
    2859    * This is an internal parameter.
    2860    */
    2861   #define CONFIGURE_POSIX_CONDITION_VARIABLES \
     2789   */
     2790  #define _CONFIGURE_POSIX_CONDITION_VARIABLES \
    28622791    (CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES + \
    2863       CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES + \
     2792      _CONFIGURE_LIBBLOCK_POSIX_CONDITION_VARIABLES + \
    28642793      CONFIGURE_MAXIMUM_ADA_TASKS + \
    28652794      CONFIGURE_MAXIMUM_FAKE_ADA_TASKS + \
    2866       CONFIGURE_GO_INIT_CONDITION_VARIABLES + \
     2795      _CONFIGURE_GO_INIT_CONDITION_VARIABLES + \
    28672796      CONFIGURE_MAXIMUM_GO_CHANNELS)
    28682797
    2869   /**
     2798  /*
    28702799   * This macro is calculated to specify the memory required for
    28712800   * the POSIX API in its entirety.
    2872    *
    2873    * This is an internal parameter.
    2874    */
    2875   #define CONFIGURE_MEMORY_FOR_POSIX \
    2876     (CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(CONFIGURE_POSIX_MUTEXES) + \
    2877       CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
    2878         CONFIGURE_POSIX_CONDITION_VARIABLES) + \
    2879       CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS( \
     2801   */
     2802  #define _CONFIGURE_MEMORY_FOR_POSIX \
     2803    (_CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(_CONFIGURE_POSIX_MUTEXES) + \
     2804      _CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
     2805        _CONFIGURE_POSIX_CONDITION_VARIABLES) + \
     2806      _CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS( \
    28802807        CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS) + \
    2881       CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES( \
     2808      _CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES( \
    28822809        CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES) + \
    2883       CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( \
     2810      _CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( \
    28842811        CONFIGURE_MAXIMUM_POSIX_SEMAPHORES) + \
    2885       CONFIGURE_MEMORY_FOR_POSIX_BARRIERS(CONFIGURE_MAXIMUM_POSIX_BARRIERS) + \
    2886       CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS( \
     2812      _CONFIGURE_MEMORY_FOR_POSIX_BARRIERS(CONFIGURE_MAXIMUM_POSIX_BARRIERS) + \
     2813      _CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS( \
    28872814        CONFIGURE_MAXIMUM_POSIX_RWLOCKS) + \
    2888       CONFIGURE_MEMORY_FOR_POSIX_SHMS( \
     2815      _CONFIGURE_MEMORY_FOR_POSIX_SHMS( \
    28892816        CONFIGURE_MAXIMUM_POSIX_SHMS) + \
    2890       CONFIGURE_MEMORY_FOR_POSIX_TIMERS(CONFIGURE_MAXIMUM_POSIX_TIMERS))
     2817      _CONFIGURE_MEMORY_FOR_POSIX_TIMERS(CONFIGURE_MAXIMUM_POSIX_TIMERS))
    28912818#else
    2892   /**
     2819  /*
    28932820   * This macro is calculated to specify the memory required for
    28942821   * the POSIX API in its entirety.
    2895    *
    2896    * This is an internal parameter.
    2897    */
    2898   #define CONFIGURE_MEMORY_FOR_POSIX 0
     2822   */
     2823  #define _CONFIGURE_MEMORY_FOR_POSIX 0
    28992824#endif
    29002825
     
    29042829 * _Heap_Block_split().
    29052830 */
    2906 #define CONFIGURE_HEAP_HANDLER_OVERHEAD \
     2831#define _CONFIGURE_HEAP_HANDLER_OVERHEAD \
    29072832  _Configure_Align_up( HEAP_BLOCK_HEADER_SIZE, CPU_HEAP_ALIGNMENT )
    29082833
     
    29122837#ifndef CONFIGURE_EXECUTIVE_RAM_SIZE
    29132838
    2914 /**
     2839/*
    29152840 * Account for allocating the following per object
    29162841 *   + array of object control structures
    29172842 *   + local pointer table -- pointer per object plus a zero'th
    29182843 *     entry in the local pointer table.
    2919  *
    2920  * This is an internal parameter.
    2921  */
    2922 #define CONFIGURE_MEMORY_FOR_TASKS(_tasks, _number_FP_tasks) \
     2844 */
     2845#define _CONFIGURE_MEMORY_FOR_TASKS(_tasks, _number_FP_tasks) \
    29232846  ( \
    29242847    _Configure_Object_RAM(_tasks, sizeof(Configuration_Thread_control)) \
     
    29292852  )
    29302853
    2931 /**
     2854/*
    29322855 * This defines the amount of memory configured for the multiprocessing
    29332856 * support required by this application.
    2934  *
    2935  * This is an internal parameter.
    29362857 */
    29372858#ifdef CONFIGURE_MP_APPLICATION
    2938   #define CONFIGURE_MEMORY_FOR_MP \
    2939     (CONFIGURE_MEMORY_FOR_PROXIES(CONFIGURE_MP_MAXIMUM_PROXIES) + \
    2940      CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS))
     2859  #define _CONFIGURE_MEMORY_FOR_MP \
     2860    (_CONFIGURE_MEMORY_FOR_PROXIES(CONFIGURE_MP_MAXIMUM_PROXIES) + \
     2861     _CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS))
    29412862#else
    2942   #define CONFIGURE_MEMORY_FOR_MP  0
     2863  #define _CONFIGURE_MEMORY_FOR_MP  0
    29432864#endif
    29442865
     
    29532874        + sizeof(CORE_message_queue_Buffer_control)))
    29542875
    2955 /**
     2876/*
    29562877 * This macro is set to the amount of memory required for pending message
    29572878 * buffers in bytes.  It should be constructed by adding together a
    29582879 * set of values determined by CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE.
    2959  *
    2960  * This is an internal parameter.
    29612880 */
    29622881#ifndef CONFIGURE_MESSAGE_BUFFER_MEMORY
     
    29842903 * for these mutexes.
    29852904 */
    2986 #define CONFIGURE_API_MUTEX_MEMORY \
     2905#define _CONFIGURE_API_MUTEX_MEMORY \
    29872906  _Configure_Object_RAM(2, sizeof(API_Mutex_Control))
    29882907
     
    29922911 */
    29932912#if defined(RTEMS_SMP)
    2994   #define CONFIGURE_IDLE_TASKS_COUNT CONFIGURE_SMP_MAXIMUM_PROCESSORS
     2913  #define _CONFIGURE_IDLE_TASKS_COUNT CONFIGURE_SMP_MAXIMUM_PROCESSORS
    29952914#else
    2996   #define CONFIGURE_IDLE_TASKS_COUNT 1
     2915  #define _CONFIGURE_IDLE_TASKS_COUNT 1
    29972916#endif
    29982917
     
    30022921 */
    30032922#if CPU_IDLE_TASK_IS_FP == TRUE
    3004   #define CONFIGURE_MEMORY_FOR_INTERNAL_TASKS \
    3005     CONFIGURE_MEMORY_FOR_TASKS( \
    3006       CONFIGURE_IDLE_TASKS_COUNT + CONFIGURE_MPCI_RECEIVE_SERVER_COUNT, \
    3007       CONFIGURE_IDLE_TASKS_COUNT + CONFIGURE_MPCI_RECEIVE_SERVER_COUNT \
     2923  #define _CONFIGURE_MEMORY_FOR_INTERNAL_TASKS \
     2924    _CONFIGURE_MEMORY_FOR_TASKS( \
     2925      _CONFIGURE_IDLE_TASKS_COUNT + _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT, \
     2926      _CONFIGURE_IDLE_TASKS_COUNT + _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT \
    30082927    )
    30092928#else
    3010   #define CONFIGURE_MEMORY_FOR_INTERNAL_TASKS \
    3011     CONFIGURE_MEMORY_FOR_TASKS( \
    3012       CONFIGURE_IDLE_TASKS_COUNT + CONFIGURE_MPCI_RECEIVE_SERVER_COUNT, \
    3013       CONFIGURE_MPCI_RECEIVE_SERVER_COUNT \
     2929  #define _CONFIGURE_MEMORY_FOR_INTERNAL_TASKS \
     2930    _CONFIGURE_MEMORY_FOR_TASKS( \
     2931      _CONFIGURE_IDLE_TASKS_COUNT + _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT, \
     2932      _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT \
    30142933    )
    30152934#endif
     
    30182937 * This macro accounts for general RTEMS system overhead.
    30192938 */
    3020 #define CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD \
    3021   ( CONFIGURE_MEMORY_FOR_INTERNAL_TASKS + \
    3022     CONFIGURE_INTERRUPT_STACK_MEMORY + \
    3023     CONFIGURE_API_MUTEX_MEMORY \
     2939#define _CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD \
     2940  ( _CONFIGURE_MEMORY_FOR_INTERNAL_TASKS + \
     2941    _CONFIGURE_INTERRUPT_STACK_MEMORY + \
     2942    _CONFIGURE_API_MUTEX_MEMORY \
    30242943  )
    30252944
     
    30282947 * user extensions.
    30292948 */
    3030 #define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \
    3031   (CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS == 0 ? 0 : \
     2949#define _CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \
     2950  (_CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS == 0 ? 0 : \
    30322951    _Configure_From_workspace( \
    3033       CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
     2952      _CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
    30342953        * sizeof(User_extensions_Switch_control) \
    30352954    ))
     
    30392958 * Classic API as configured.
    30402959 */
    3041 #define CONFIGURE_MEMORY_FOR_CLASSIC \
    3042    (CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS + \
    3043     CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER ) + \
    3044    CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_SEMAPHORES) + \
    3045    CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \
    3046    CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \
    3047    CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ) + \
    3048    CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \
    3049    CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \
    3050    CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_BARRIERS) + \
    3051    CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS) \
     2960#define _CONFIGURE_MEMORY_FOR_CLASSIC \
     2961   (_CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS + \
     2962    _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER ) + \
     2963   _CONFIGURE_MEMORY_FOR_SEMAPHORES(_CONFIGURE_SEMAPHORES) + \
     2964   _CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \
     2965   _CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \
     2966   _CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ) + \
     2967   _CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \
     2968   _CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \
     2969   _CONFIGURE_MEMORY_FOR_BARRIERS(_CONFIGURE_BARRIERS) + \
     2970   _CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS) \
    30522971  )
    30532972
    3054 /**
     2973/*
    30552974 * This macro provides a summation of the memory required by SMP as configured.
    3056  *
    3057  * This is an internal parameter.
    30582975 */
    30592976#if defined(RTEMS_SMP)
    3060   #define CONFIGURE_MEMORY_FOR_SMP \
     2977  #define _CONFIGURE_MEMORY_FOR_SMP \
    30612978     (CONFIGURE_SMP_MAXIMUM_PROCESSORS * \
    30622979      _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE ) \
    30632980     )
    30642981#else
    3065   #define CONFIGURE_MEMORY_FOR_SMP 0
     2982  #define _CONFIGURE_MEMORY_FOR_SMP 0
    30662983#endif
    30672984
     
    30732990#define CONFIGURE_EXECUTIVE_RAM_SIZE \
    30742991( \
    3075    CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD + \
    3076    CONFIGURE_MEMORY_FOR_TASKS( \
    3077      CONFIGURE_TASKS, CONFIGURE_TASKS) + \
    3078    CONFIGURE_MEMORY_FOR_TASKS( \
    3079      CONFIGURE_POSIX_THREADS, CONFIGURE_POSIX_THREADS) + \
    3080    CONFIGURE_MEMORY_FOR_CLASSIC + \
    3081    CONFIGURE_MEMORY_FOR_POSIX_KEYS( \
    3082       CONFIGURE_POSIX_KEYS, \
     2992   _CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD + \
     2993   _CONFIGURE_MEMORY_FOR_TASKS( \
     2994     _CONFIGURE_TASKS, _CONFIGURE_TASKS) + \
     2995   _CONFIGURE_MEMORY_FOR_TASKS( \
     2996     _CONFIGURE_POSIX_THREADS, _CONFIGURE_POSIX_THREADS) + \
     2997   _CONFIGURE_MEMORY_FOR_CLASSIC + \
     2998   _CONFIGURE_MEMORY_FOR_POSIX_KEYS( \
     2999      _CONFIGURE_POSIX_KEYS, \
    30833000      CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS ) + \
    3084    CONFIGURE_MEMORY_FOR_POSIX + \
    3085    CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS + \
    3086    CONFIGURE_MEMORY_FOR_MP + \
    3087    CONFIGURE_MEMORY_FOR_SMP + \
     3001   _CONFIGURE_MEMORY_FOR_POSIX + \
     3002   _CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS + \
     3003   _CONFIGURE_MEMORY_FOR_MP + \
     3004   _CONFIGURE_MEMORY_FOR_SMP + \
    30883005   CONFIGURE_MESSAGE_BUFFER_MEMORY + \
    30893006   (CONFIGURE_MEMORY_OVERHEAD * 1024) + \
    3090    CONFIGURE_HEAP_HANDLER_OVERHEAD \
     3007   _CONFIGURE_HEAP_HANDLER_OVERHEAD \
    30913008)
    30923009
     
    30963013 */
    30973014
    3098 /**
     3015/*
    30993016 * This accounts for any extra memory required by the Classic API
    31003017 * Initialization Task.
    3101  *
    3102  * This is an internal parameter.
    31033018 */
    31043019#if (CONFIGURE_INIT_TASK_STACK_SIZE > CONFIGURE_MINIMUM_TASK_STACK_SIZE)
    3105   #define CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART \
     3020  #define _CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART \
    31063021      (CONFIGURE_INIT_TASK_STACK_SIZE - CONFIGURE_MINIMUM_TASK_STACK_SIZE)
    31073022#else
    3108   #define CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART 0
    3109 #endif
    3110 
    3111 /**
     3023  #define _CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART 0
     3024#endif
     3025
     3026/*
    31123027 * This accounts for any extra memory required by the POSIX API
    31133028 * Initialization Thread.
    3114  *
    3115  * This is an internal parameter.
    31163029 */
    31173030#if defined(RTEMS_POSIX_API) && \
    31183031    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE > \
    31193032      CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE)
    3120   #define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART \
     3033  #define _CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART \
    31213034    (CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE - \
    31223035      CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE)
    31233036#else
    3124   #define CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART 0
    3125 #endif
    3126 
    3127 /**
     3037  #define _CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART 0
     3038#endif
     3039
     3040/*
    31283041 * This macro provides a summation of the various initialization task
    31293042 * and thread stack requirements.
    3130  *
    3131  * This is an internal parameter.
    3132  */
    3133 #define CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS \
    3134     (CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART + \
    3135     CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART)
    3136 
    3137 /**
     3043 */
     3044#define _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS \
     3045    (_CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART + \
     3046    _CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART)
     3047
     3048/*
    31383049 * This macro is calculated to specify the memory required for
    31393050 * the Idle tasks(s) stack.
    3140  *
    3141  * This is an internal parameter.
    3142  */
    3143 #define CONFIGURE_IDLE_TASKS_STACK \
    3144   (CONFIGURE_IDLE_TASKS_COUNT * \
     3051 */
     3052#define _CONFIGURE_IDLE_TASKS_STACK \
     3053  (_CONFIGURE_IDLE_TASKS_COUNT * \
    31453054    _Configure_From_stackspace( CONFIGURE_IDLE_TASK_STACK_SIZE ) )
    31463055
    3147 /**
     3056/*
    31483057 * This macro is calculated to specify the stack memory required for the MPCI
    31493058 * task.
    3150  *
    3151  * This is an internal parameter.
    3152  */
    3153 #define CONFIGURE_MPCI_RECEIVE_SERVER_STACK \
    3154   (CONFIGURE_MPCI_RECEIVE_SERVER_COUNT * \
     3059 */
     3060#define _CONFIGURE_MPCI_RECEIVE_SERVER_STACK \
     3061  (_CONFIGURE_MPCI_RECEIVE_SERVER_COUNT * \
    31553062    _Configure_From_stackspace(CONFIGURE_MINIMUM_TASK_STACK_SIZE))
    31563063
    3157 /**
     3064/*
    31583065 * This macro is calculated to specify the memory required for
    31593066 * the stacks of all tasks.
    3160  *
    3161  * This is an internal parameter.
    3162  */
    3163 #define CONFIGURE_TASKS_STACK \
    3164   (_Configure_Max_Objects( CONFIGURE_TASKS ) * \
     3067 */
     3068#define _CONFIGURE_TASKS_STACK \
     3069  (_Configure_Max_Objects( _CONFIGURE_TASKS ) * \
    31653070    _Configure_From_stackspace( CONFIGURE_MINIMUM_TASK_STACK_SIZE ) )
    31663071
    3167 /**
     3072/*
    31683073 * This macro is calculated to specify the memory required for
    31693074 * the stacks of all POSIX threads.
    3170  *
    3171  * This is an internal parameter.
    3172  */
    3173 #define CONFIGURE_POSIX_THREADS_STACK \
     3075 */
     3076#define _CONFIGURE_POSIX_THREADS_STACK \
    31743077  (_Configure_Max_Objects( CONFIGURE_MAXIMUM_POSIX_THREADS ) * \
    31753078    _Configure_From_stackspace( CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE ) )
    31763079
    3177 /**
     3080/*
    31783081 * This macro is calculated to specify the memory required for
    31793082 * the stacks of all Ada tasks.
    3180  *
    3181  * This is an internal parameter.
    3182  */
    3183 #define CONFIGURE_ADA_TASKS_STACK \
     3083 */
     3084#define _CONFIGURE_ADA_TASKS_STACK \
    31843085  (_Configure_Max_Objects( CONFIGURE_MAXIMUM_ADA_TASKS ) * \
    31853086    _Configure_From_stackspace( CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE ) )
    31863087
    3187 /**
     3088/*
    31883089 * This macro is calculated to specify the memory required for
    31893090 * the stacks of all Go routines.
    3190  *
    3191  * This is an internal parameter.
    3192  */
    3193 #define CONFIGURE_GOROUTINES_STACK \
     3091 */
     3092#define _CONFIGURE_GOROUTINES_STACK \
    31943093  (_Configure_Max_Objects( CONFIGURE_MAXIMUM_GOROUTINES ) * \
    31953094    _Configure_From_stackspace( CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE ) )
     
    31973096#else /* CONFIGURE_EXECUTIVE_RAM_SIZE */
    31983097
    3199 #define CONFIGURE_IDLE_TASKS_STACK 0
    3200 #define CONFIGURE_MPCI_RECEIVE_SERVER_STACK 0
    3201 #define CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS 0
    3202 #define CONFIGURE_TASKS_STACK 0
    3203 #define CONFIGURE_POSIX_THREADS_STACK 0
    3204 #define CONFIGURE_GOROUTINES_STACK 0
    3205 #define CONFIGURE_ADA_TASKS_STACK 0
     3098#define _CONFIGURE_IDLE_TASKS_STACK 0
     3099#define _CONFIGURE_MPCI_RECEIVE_SERVER_STACK 0
     3100#define _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS 0
     3101#define _CONFIGURE_TASKS_STACK 0
     3102#define _CONFIGURE_POSIX_THREADS_STACK 0
     3103#define _CONFIGURE_GOROUTINES_STACK 0
     3104#define _CONFIGURE_ADA_TASKS_STACK 0
    32063105
    32073106#if CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK != 0
     
    32153114#endif /* CONFIGURE_EXECUTIVE_RAM_SIZE */
    32163115
    3217 /**
     3116/*
    32183117 * This macro is calculated to specify the memory required for
    32193118 * all tasks and threads of all varieties.
    3220  *
    3221  * This is an internal parameter.
    3222  */
    3223 #define CONFIGURE_STACK_SPACE_SIZE \
     3119 */
     3120#define _CONFIGURE_STACK_SPACE_SIZE \
    32243121  ( \
    3225     CONFIGURE_IDLE_TASKS_STACK + \
    3226     CONFIGURE_MPCI_RECEIVE_SERVER_STACK + \
    3227     CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS + \
    3228     CONFIGURE_TASKS_STACK + \
    3229     CONFIGURE_POSIX_THREADS_STACK + \
    3230     CONFIGURE_GOROUTINES_STACK + \
    3231     CONFIGURE_ADA_TASKS_STACK + \
     3122    _CONFIGURE_IDLE_TASKS_STACK + \
     3123    _CONFIGURE_MPCI_RECEIVE_SERVER_STACK + \
     3124    _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS + \
     3125    _CONFIGURE_TASKS_STACK + \
     3126    _CONFIGURE_POSIX_THREADS_STACK + \
     3127    _CONFIGURE_GOROUTINES_STACK + \
     3128    _CONFIGURE_ADA_TASKS_STACK + \
    32323129    CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK + \
    3233     CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS + \
     3130    _CONFIGURE_LIBBLOCK_TASK_EXTRA_STACKS + \
    32343131    CONFIGURE_EXTRA_TASK_STACKS + \
    3235     CONFIGURE_HEAP_HANDLER_OVERHEAD \
     3132    _CONFIGURE_HEAP_HANDLER_OVERHEAD \
    32363133  )
    32373134
     
    33433240   */
    33443241  rtems_api_configuration_table Configuration_RTEMS_API = {
    3345     CONFIGURE_TASKS,
    3346     CONFIGURE_MAXIMUM_TIMERS + CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER,
    3347     CONFIGURE_SEMAPHORES,
     3242    _CONFIGURE_TASKS,
     3243    CONFIGURE_MAXIMUM_TIMERS + _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER,
     3244    _CONFIGURE_SEMAPHORES,
    33483245    CONFIGURE_MAXIMUM_MESSAGE_QUEUES,
    33493246    CONFIGURE_MAXIMUM_PARTITIONS,
     
    33513248    CONFIGURE_MAXIMUM_PORTS,
    33523249    CONFIGURE_MAXIMUM_PERIODS,
    3353     CONFIGURE_BARRIERS,
     3250    _CONFIGURE_BARRIERS,
    33543251    CONFIGURE_INIT_TASK_TABLE_SIZE,
    33553252    CONFIGURE_INIT_TASK_TABLE
     
    33613258     */
    33623259    posix_api_configuration_table Configuration_POSIX_API = {
    3363       CONFIGURE_POSIX_THREADS,
    3364       CONFIGURE_POSIX_MUTEXES,
    3365       CONFIGURE_POSIX_CONDITION_VARIABLES,
     3260      _CONFIGURE_POSIX_THREADS,
     3261      _CONFIGURE_POSIX_MUTEXES,
     3262      _CONFIGURE_POSIX_CONDITION_VARIABLES,
    33663263      CONFIGURE_MAXIMUM_POSIX_TIMERS,
    33673264      CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS,
     
    33923289  const rtems_configuration_table Configuration = {
    33933290    CONFIGURE_EXECUTIVE_RAM_SIZE,             /* required RTEMS workspace */
    3394     CONFIGURE_STACK_SPACE_SIZE,               /* required stack space */
     3291    _CONFIGURE_STACK_SPACE_SIZE,               /* required stack space */
    33953292    CONFIGURE_MAXIMUM_USER_EXTENSIONS,        /* maximum dynamic extensions */
    3396     CONFIGURE_POSIX_KEYS,                     /* POSIX keys are always */
     3293    _CONFIGURE_POSIX_KEYS,                     /* POSIX keys are always */
    33973294    CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS,  /*   enabled */
    33983295    CONFIGURE_MICROSECONDS_PER_TICK,          /* microseconds per clock tick */
     
    34183315      false,
    34193316    #endif
    3420     CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,   /* number of static extensions */
     3317    _CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,   /* number of static extensions */
    34213318    CONFIGURE_INITIAL_EXTENSION_TABLE,        /* pointer to static extensions */
    34223319    #if defined(RTEMS_MULTIPROCESSING)
     
    35953492  Configuration_Debug_t Configuration_Memory_Debug = {
    35963493    /* General Information */
    3597     CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD,
    3598     CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS,
    3599     CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS,
    3600     CONFIGURE_MEMORY_FOR_TASKS(1, 0),
    3601     CONFIGURE_MEMORY_FOR_TASKS(0, 1),
    3602     CONFIGURE_MEMORY_FOR_CLASSIC,
    3603     CONFIGURE_MEMORY_FOR_POSIX,
     3494    _CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD,
     3495    _CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS,
     3496    _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS,
     3497    _CONFIGURE_MEMORY_FOR_TASKS(1, 0),
     3498    _CONFIGURE_MEMORY_FOR_TASKS(0, 1),
     3499    _CONFIGURE_MEMORY_FOR_CLASSIC,
     3500    _CONFIGURE_MEMORY_FOR_POSIX,
    36043501
    36053502    /* System overhead pieces */
    3606     CONFIGURE_INTERRUPT_STACK_MEMORY,
    3607     CONFIGURE_MEMORY_FOR_INTERNAL_TASKS,
     3503    _CONFIGURE_INTERRUPT_STACK_MEMORY,
     3504    _CONFIGURE_MEMORY_FOR_INTERNAL_TASKS,
    36083505
    36093506    /* Classic API Pieces */
    3610     CONFIGURE_MEMORY_FOR_TASKS(CONFIGURE_MAXIMUM_TASKS, 0),
    3611     CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS),
    3612     CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_SEMAPHORES),
    3613     CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES),
    3614     CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS),
    3615     CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ),
    3616     CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS),
    3617     CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS),
    3618     CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_BARRIERS),
    3619     CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS),
    3620     CONFIGURE_MEMORY_FOR_POSIX_KEYS( CONFIGURE_POSIX_KEYS, \
     3507    _CONFIGURE_MEMORY_FOR_TASKS(CONFIGURE_MAXIMUM_TASKS, 0),
     3508    _CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS),
     3509    _CONFIGURE_MEMORY_FOR_SEMAPHORES(_CONFIGURE_SEMAPHORES),
     3510    _CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES),
     3511    _CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS),
     3512    _CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ),
     3513    _CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS),
     3514    _CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS),
     3515    _CONFIGURE_MEMORY_FOR_BARRIERS(_CONFIGURE_BARRIERS),
     3516    _CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS),
     3517    _CONFIGURE_MEMORY_FOR_POSIX_KEYS( _CONFIGURE_POSIX_KEYS, \
    36213518                                     CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS ),
    36223519
    36233520#ifdef RTEMS_POSIX_API
    36243521    /* POSIX API Pieces */
    3625     CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_POSIX_MUTEXES ),
    3626     CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(
    3627       CONFIGURE_POSIX_CONDITION_VARIABLES ),
    3628     CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(
     3522    _CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( _CONFIGURE_POSIX_MUTEXES ),
     3523    _CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(
     3524      _CONFIGURE_POSIX_CONDITION_VARIABLES ),
     3525    _CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(
    36293526      CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS ),
    3630     CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES(
     3527    _CONFIGURE_MEMORY_FOR_POSIX_MESSAGE_QUEUES(
    36313528      CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES ),
    3632     CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( CONFIGURE_MAXIMUM_POSIX_SEMAPHORES ),
    3633     CONFIGURE_MEMORY_FOR_POSIX_BARRIERS( CONFIGURE_MAXIMUM_POSIX_BARRIERS ),
    3634     CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS( CONFIGURE_MAXIMUM_POSIX_RWLOCKS ),
    3635     CONFIGURE_MEMORY_FOR_POSIX_SHMS( CONFIGURE_MAXIMUM_POSIX_SHMS ),
    3636     CONFIGURE_MEMORY_FOR_POSIX_TIMERS( CONFIGURE_MAXIMUM_POSIX_TIMERS ),
     3529    _CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( CONFIGURE_MAXIMUM_POSIX_SEMAPHORES ),
     3530    _CONFIGURE_MEMORY_FOR_POSIX_BARRIERS( CONFIGURE_MAXIMUM_POSIX_BARRIERS ),
     3531    _CONFIGURE_MEMORY_FOR_POSIX_RWLOCKS( CONFIGURE_MAXIMUM_POSIX_RWLOCKS ),
     3532    _CONFIGURE_MEMORY_FOR_POSIX_SHMS( CONFIGURE_MAXIMUM_POSIX_SHMS ),
     3533    _CONFIGURE_MEMORY_FOR_POSIX_TIMERS( CONFIGURE_MAXIMUM_POSIX_TIMERS ),
    36373534#endif
    36383535
    36393536    /* Stack space sizes */
    3640     CONFIGURE_IDLE_TASKS_STACK,
    3641     CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS,
    3642     CONFIGURE_TASKS_STACK,
    3643     CONFIGURE_POSIX_THREADS_STACK,
    3644     CONFIGURE_GOROUTINES_STACK,
    3645     CONFIGURE_ADA_TASKS_STACK,
     3537    _CONFIGURE_IDLE_TASKS_STACK,
     3538    _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS,
     3539    _CONFIGURE_TASKS_STACK,
     3540    _CONFIGURE_POSIX_THREADS_STACK,
     3541    _CONFIGURE_GOROUTINES_STACK,
     3542    _CONFIGURE_ADA_TASKS_STACK,
    36463543    CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK,
    36473544    CONFIGURE_EXTRA_TASK_STACKS
  • testsuites/psxtests/psxconfig01/init.c

    r85ed95e r07d71279  
    301301  rtems_resource_snapshot_take(&snapshot);
    302302  rtems_test_assert(
    303     snapshot.active_posix_keys == CONFIGURE_POSIX_KEYS
     303    snapshot.active_posix_keys == _CONFIGURE_POSIX_KEYS
    304304  );
    305305  rtems_test_assert(
  • testsuites/sptests/spstkalloc02/init.c

    r85ed95e r07d71279  
    139139
    140140static char task_stack_space
    141   [CONFIGURE_TASK_STACK_FROM_ALLOCATOR(CONFIGURE_STACK_SPACE_SIZE)];
     141  [CONFIGURE_TASK_STACK_FROM_ALLOCATOR(_CONFIGURE_STACK_SPACE_SIZE)];
    142142
    143143static void task_stack_init(size_t stack_space_size)
     
    150150  );
    151151
    152   rtems_test_assert(stack_space_size == CONFIGURE_STACK_SPACE_SIZE);
     152  rtems_test_assert(stack_space_size == _CONFIGURE_STACK_SPACE_SIZE);
    153153  rtems_test_assert(ok);
    154154}
Note: See TracChangeset for help on using the changeset viewer.