Changeset 2eba45d in rtems


Ignore:
Timestamp:
05/28/96 14:16:45 (27 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
52d9e4d1
Parents:
4b06db75
Message:

made posix configuration information conditional so configurations wanting
only the rtems api don't have to include it.

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • c/src/exec/sapi/headers/confdefs.h

    r4b06db75 r2eba45d  
    2727extern rtems_configuration_table        Configuration;
    2828extern rtems_multiprocessing_table      Multiprocessing_configuration;
     29#ifdef RTEMS_POSIX_API
     30extern posix_api_configuration_table Configuration_POSIX_API;
     31#endif
    2932
    3033/*
    … …  
    234237#ifndef CONFIGURE_INITIAL_EXTENSIONS 
    235238#define CONFIGURE_INITIAL_EXTENSIONS         NULL
     239#endif
     240
     241/*
     242 *  POSIX API Configuration Parameters
     243 */
     244
     245#ifdef RTEMS_POSIX_API
     246
     247#ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
     248#define CONFIGURE_MAXIMUM_POSIX_THREADS      10
     249#endif
     250
     251#ifndef CONFIGURE_MAXIMUM_POSIX_MUTEXES
     252#define CONFIGURE_MAXIMUM_POSIX_MUTEXES     0
     253#endif
     254
     255#ifndef CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES
     256#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  0
     257#endif
     258
    236259#endif
    237260
    … …  
    356379};
    357380
     381#ifdef RTEMS_POSIX_API
     382posix_api_configuration_table Configuration_POSIX_API = {
     383  CONFIGURE_MAXIMUM_POSIX_THREADS,
     384  CONFIGURE_MAXIMUM_POSIX_MUTEXES,
     385  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES,
     386  0,
     387  NULL
     388};
     389#endif
     390
    358391rtems_configuration_table Configuration = {
    359392  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
    … …  
    369402  CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
    370403  &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */
    371   NULL                                       /* pointer to RTEMS API config */
     404#ifdef RTEMS_POSIX_API
     405  &Configuration_POSIX_API                   /* pointer to POSIX API config */
     406#else
     407  NULL                                       /* pointer to POSIX API config */
     408#endif
    372409};
    373410#endif

  • c/src/exec/sapi/headers/config.h

    r4b06db75 r2eba45d  
    2222#endif
    2323
     24/*
     25 *  This is kind of kludgy but it allows targets to totally ignore the
     26 *  POSIX API safely.
     27 */
     28
     29#ifdef RTEMS_POSIX_API
    2430#include <rtems/posix/config.h>
     31#else
     32
     33typedef void *posix_api_configuration_table;
     34#endif
     35
    2536#include <rtems/rtems/config.h>
    2637

  • c/src/exec/sapi/include/confdefs.h

    r4b06db75 r2eba45d  
    2727extern rtems_configuration_table        Configuration;
    2828extern rtems_multiprocessing_table      Multiprocessing_configuration;
     29#ifdef RTEMS_POSIX_API
     30extern posix_api_configuration_table Configuration_POSIX_API;
     31#endif
    2932
    3033/*
    … …  
    234237#ifndef CONFIGURE_INITIAL_EXTENSIONS 
    235238#define CONFIGURE_INITIAL_EXTENSIONS         NULL
     239#endif
     240
     241/*
     242 *  POSIX API Configuration Parameters
     243 */
     244
     245#ifdef RTEMS_POSIX_API
     246
     247#ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
     248#define CONFIGURE_MAXIMUM_POSIX_THREADS      10
     249#endif
     250
     251#ifndef CONFIGURE_MAXIMUM_POSIX_MUTEXES
     252#define CONFIGURE_MAXIMUM_POSIX_MUTEXES     0
     253#endif
     254
     255#ifndef CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES
     256#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  0
     257#endif
     258
    236259#endif
    237260
    … …  
    356379};
    357380
     381#ifdef RTEMS_POSIX_API
     382posix_api_configuration_table Configuration_POSIX_API = {
     383  CONFIGURE_MAXIMUM_POSIX_THREADS,
     384  CONFIGURE_MAXIMUM_POSIX_MUTEXES,
     385  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES,
     386  0,
     387  NULL
     388};
     389#endif
     390
    358391rtems_configuration_table Configuration = {
    359392  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
    … …  
    369402  CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
    370403  &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */
    371   NULL                                       /* pointer to RTEMS API config */
     404#ifdef RTEMS_POSIX_API
     405  &Configuration_POSIX_API                   /* pointer to POSIX API config */
     406#else
     407  NULL                                       /* pointer to POSIX API config */
     408#endif
    372409};
    373410#endif

  • c/src/exec/sapi/include/rtems/config.h

    r4b06db75 r2eba45d  
    2222#endif
    2323
     24/*
     25 *  This is kind of kludgy but it allows targets to totally ignore the
     26 *  POSIX API safely.
     27 */
     28
     29#ifdef RTEMS_POSIX_API
    2430#include <rtems/posix/config.h>
     31#else
     32
     33typedef void *posix_api_configuration_table;
     34#endif
     35
    2536#include <rtems/rtems/config.h>
    2637

  • cpukit/sapi/include/confdefs.h

    r4b06db75 r2eba45d  
    2727extern rtems_configuration_table        Configuration;
    2828extern rtems_multiprocessing_table      Multiprocessing_configuration;
     29#ifdef RTEMS_POSIX_API
     30extern posix_api_configuration_table Configuration_POSIX_API;
     31#endif
    2932
    3033/*
    … …  
    234237#ifndef CONFIGURE_INITIAL_EXTENSIONS 
    235238#define CONFIGURE_INITIAL_EXTENSIONS         NULL
     239#endif
     240
     241/*
     242 *  POSIX API Configuration Parameters
     243 */
     244
     245#ifdef RTEMS_POSIX_API
     246
     247#ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
     248#define CONFIGURE_MAXIMUM_POSIX_THREADS      10
     249#endif
     250
     251#ifndef CONFIGURE_MAXIMUM_POSIX_MUTEXES
     252#define CONFIGURE_MAXIMUM_POSIX_MUTEXES     0
     253#endif
     254
     255#ifndef CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES
     256#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  0
     257#endif
     258
    236259#endif
    237260
    … …  
    356379};
    357380
     381#ifdef RTEMS_POSIX_API
     382posix_api_configuration_table Configuration_POSIX_API = {
     383  CONFIGURE_MAXIMUM_POSIX_THREADS,
     384  CONFIGURE_MAXIMUM_POSIX_MUTEXES,
     385  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES,
     386  0,
     387  NULL
     388};
     389#endif
     390
    358391rtems_configuration_table Configuration = {
    359392  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
    … …  
    369402  CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
    370403  &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */
    371   NULL                                       /* pointer to RTEMS API config */
     404#ifdef RTEMS_POSIX_API
     405  &Configuration_POSIX_API                   /* pointer to POSIX API config */
     406#else
     407  NULL                                       /* pointer to POSIX API config */
     408#endif
    372409};
    373410#endif

  • cpukit/sapi/include/rtems/config.h

    r4b06db75 r2eba45d  
    2222#endif
    2323
     24/*
     25 *  This is kind of kludgy but it allows targets to totally ignore the
     26 *  POSIX API safely.
     27 */
     28
     29#ifdef RTEMS_POSIX_API
    2430#include <rtems/posix/config.h>
     31#else
     32
     33typedef void *posix_api_configuration_table;
     34#endif
     35
    2536#include <rtems/rtems/config.h>
    2637
Note: See TracChangeset for help on using the changeset viewer.