Changeset 97e2fc3f in rtems


Ignore:
Timestamp:
Jun 17, 2010, 6:39:28 PM (9 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
11be37d
Parents:
1a4a0b6
Message:

2010-06-17 Joel Sherrill <joel.sherrill@…>

  • sapi/include/confdefs.h: Remove ITRON configuration parameters.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r1a4a0b6 r97e2fc3f  
     12010-06-17      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * sapi/include/confdefs.h: Remove ITRON configuration parameters.
     4
    152010-06-17      Joel Sherrill <joel.sherrilL@OARcorp.com>
    26
  • cpukit/sapi/include/confdefs.h

    r1a4a0b6 r97e2fc3f  
    5858#ifdef RTEMS_POSIX_API
    5959  extern posix_api_configuration_table    Configuration_POSIX_API;
    60 #endif
    61 #ifdef RTEMS_ITRON_API
    62   extern itron_api_configuration_table    Configuration_ITRON_API;
    6360#endif
    6461
     
    15051502#endif
    15061503
    1507 /*
    1508  *  ITRON API Configuration Parameters
    1509  */
    1510 
    1511 #ifdef RTEMS_ITRON_API
    1512 
    1513   #include <rtems/itron.h>
    1514   #include <rtems/itron/config.h>
    1515   #include <rtems/itron/eventflags.h>
    1516   #include <rtems/itron/fmempool.h>
    1517   #include <rtems/itron/mbox.h>
    1518   #include <rtems/itron/msgbuffer.h>
    1519   #include <rtems/itron/port.h>
    1520   #include <rtems/itron/semaphore.h>
    1521   #include <rtems/itron/task.h>
    1522   #include <rtems/itron/vmempool.h>
    1523 
    1524   #ifndef CONFIGURE_MAXIMUM_ITRON_TASKS
    1525     #define CONFIGURE_MAXIMUM_ITRON_TASKS      0
    1526   #endif
    1527   #define CONFIGURE_MEMORY_PER_TASK_FOR_ITRON_API 0
    1528 
    1529   #ifndef CONFIGURE_MAXIMUM_ITRON_SEMAPHORES
    1530     #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES                 0
    1531     #define CONFIGURE_MEMORY_FOR_ITRON_SEMAPHORES(_semaphores) 0
    1532   #else
    1533     #define CONFIGURE_MEMORY_FOR_ITRON_SEMAPHORES(_semaphores) \
    1534       _Configure_Object_RAM(_semaphores, sizeof(ITRON_Semaphore_Control))
    1535   #endif
    1536 
    1537   #ifndef CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS
    1538     #define CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS                 0
    1539     #define CONFIGURE_MEMORY_FOR_ITRON_EVENTFLAGS(_eventflags) 0
    1540   #else
    1541     #define CONFIGURE_MEMORY_FOR_ITRON_EVENTFLAGS(_eventflags) \
    1542       _Configure_Object_RAM(_eventflags, sizeof(ITRON_Eventflags_Control))
    1543   #endif
    1544 
    1545   #ifndef CONFIGURE_MAXIMUM_ITRON_MAILBOXES
    1546     #define CONFIGURE_MAXIMUM_ITRON_MAILBOXES                0
    1547     #define CONFIGURE_MEMORY_FOR_ITRON_MAILBOXES(_mailboxes) 0
    1548   #else
    1549     #define CONFIGURE_MEMORY_FOR_ITRON_MAILBOXES(_mailboxes) \
    1550       _Configure_Object_RAM(_mailboxes, sizeof(ITRON_Mailbox_Control))
    1551   #endif
    1552 
    1553   #ifndef CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS
    1554     #define CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS                      0
    1555     #define CONFIGURE_MEMORY_FOR_ITRON_MESSAGE_BUFFERS(_message_buffers) 0
    1556   #else
    1557     #define CONFIGURE_MEMORY_FOR_ITRON_MESSAGE_BUFFERS(_message_buffers) \
    1558       _Configure_Object_RAM(_message_buffers, \
    1559         sizeof(ITRON_Message_buffer_Control))
    1560   #endif
    1561 
    1562   #ifndef CONFIGURE_MAXIMUM_ITRON_PORTS
    1563     #define CONFIGURE_MAXIMUM_ITRON_PORTS            0
    1564     #define CONFIGURE_MEMORY_FOR_ITRON_PORTS(_ports) 0
    1565   #else
    1566     #define CONFIGURE_MEMORY_FOR_ITRON_PORTS(_ports) \
    1567       _Configure_Object_RAM(_ports, sizeof(ITRON_Port_Control))
    1568   #endif
    1569 
    1570   #ifndef CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS
    1571     #define CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS            0
    1572     #define CONFIGURE_MEMORY_FOR_ITRON_MEMORY_POOLS(_pools) 0
    1573   #else
    1574     #define CONFIGURE_MEMORY_FOR_ITRON_MEMORY_POOLS(_pools) \
    1575       _Configure_Object_RAM( _pools, sizeof(ITRON_Variable_memory_pool_Control))
    1576   #endif
    1577 
    1578   #ifndef CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS
    1579     #define CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS            0
    1580     #define CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS(_pools) 0
    1581   #else
    1582     #define CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS(_pools) \
    1583       _Configure_Object_RAM(_pools, sizeof(ITRON_Fixed_memory_pool_Control))
    1584   #endif
    1585 
    1586   #ifdef CONFIGURE_ITRON_INIT_TASK_TABLE
    1587 
    1588     #ifdef CONFIGURE_ITRON_HAS_OWN_INIT_TASK_TABLE
    1589 
    1590       /*
    1591        *  The user is defining their own table information and setting the
    1592        *  appropriate variables for the ITRON Initialization Task Table.
    1593        */
    1594 
    1595     #else
    1596 
    1597       #ifndef CONFIGURE_ITRON_INIT_TASK_ENTRY_POINT
    1598         #define CONFIGURE_ITRON_INIT_TASK_ENTRY_POINT   ITRON_Init
    1599       #endif
    1600 
    1601       #ifndef CONFIGURE_ITRON_INIT_TASK_ATTRIBUTES
    1602         #define CONFIGURE_ITRON_INIT_TASK_ATTRIBUTES    TA_HLNG
    1603       #endif
    1604 
    1605       #ifndef CONFIGURE_ITRON_INIT_TASK_PRIORITY
    1606         #define CONFIGURE_ITRON_INIT_TASK_PRIORITY      1
    1607       #endif
    1608 
    1609       #ifndef CONFIGURE_ITRON_INIT_TASK_STACK_SIZE
    1610         #define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE \
    1611                 CONFIGURE_MINIMUM_TASK_STACK_SIZE
    1612       #endif
    1613 
    1614       #ifdef CONFIGURE_INIT
    1615         itron_initialization_tasks_table ITRON_Initialization_tasks[] = {
    1616           { 1,                                    /* ID */
    1617             { (VP) 0,                                /* exinfo */
    1618               CONFIGURE_ITRON_INIT_TASK_ATTRIBUTES,  /* task attributes */
    1619               CONFIGURE_ITRON_INIT_TASK_ENTRY_POINT, /* task start address */
    1620               CONFIGURE_ITRON_INIT_TASK_PRIORITY,    /* initial task priority */
    1621               CONFIGURE_ITRON_INIT_TASK_STACK_SIZE   /* stack size */
    1622             }
    1623           }
    1624         };
    1625       #endif
    1626 
    1627       #define CONFIGURE_ITRON_INIT_TASK_TABLE_NAME ITRON_Initialization_tasks
    1628 
    1629       #define CONFIGURE_ITRON_INIT_TASK_TABLE_SIZE \
    1630         sizeof(CONFIGURE_ITRON_INIT_TASK_TABLE_NAME) / \
    1631             sizeof(itron_initialization_tasks_table)
    1632 
    1633     #endif    /* CONFIGURE_ITRON_HAS_OWN_INIT_TASK_TABLE */
    1634 
    1635   #else     /* CONFIGURE_ITRON_INIT_TASK_TABLE */
    1636 
    1637     #define CONFIGURE_ITRON_INIT_TASK_TABLE_NAME NULL
    1638     #define CONFIGURE_ITRON_INIT_TASK_TABLE_SIZE 0
    1639     #define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE 0
    1640 
    1641   #endif
    1642 
    1643   #define CONFIGURE_MEMORY_FOR_ITRON \
    1644     ( CONFIGURE_MEMORY_FOR_ITRON_SEMAPHORES( \
    1645           CONFIGURE_MAXIMUM_ITRON_SEMAPHORES ) + \
    1646       CONFIGURE_MEMORY_FOR_ITRON_EVENTFLAGS( \
    1647           CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS ) + \
    1648       CONFIGURE_MEMORY_FOR_ITRON_MAILBOXES( \
    1649           CONFIGURE_MAXIMUM_ITRON_MAILBOXES ) + \
    1650       CONFIGURE_MEMORY_FOR_ITRON_MESSAGE_BUFFERS( \
    1651           CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS ) + \
    1652       CONFIGURE_MEMORY_FOR_ITRON_PORTS( \
    1653           CONFIGURE_MAXIMUM_ITRON_PORTS ) + \
    1654       CONFIGURE_MEMORY_FOR_ITRON_MEMORY_POOLS( \
    1655           CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS ) + \
    1656       CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS( \
    1657           CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS ) + \
    1658       CONFIGURE_ITRON_INIT_TASK_STACK_SIZE \
    1659      )
    1660 
    1661 #else
    1662 
    1663   #define CONFIGURE_MAXIMUM_ITRON_TASKS               0
    1664   #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES          0
    1665   #define CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS          0
    1666   #define CONFIGURE_MAXIMUM_ITRON_MAILBOXES           0
    1667   #define CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS     0
    1668   #define CONFIGURE_MAXIMUM_ITRON_PORTS               0
    1669   #define CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS        0
    1670   #define CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS  0
    1671   #define CONFIGURE_MEMORY_PER_TASK_FOR_ITRON_API     0
    1672   #define CONFIGURE_MEMORY_FOR_ITRON                  0
    1673 
    1674 #endif    /* RTEMS_ITRON_API */
    1675 
    16761504/**
    16771505 *  This macro specifies the amount of memory to be reserved for the
     
    17081536    CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API + \
    17091537    CONFIGURE_MEMORY_PER_TASK_FOR_NEWLIB + \
    1710     CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API + \
    1711     CONFIGURE_MEMORY_PER_TASK_FOR_ITRON_API))  + \
     1538    CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API))  + \
    17121539  _Configure_From_workspace( \
    17131540    _Configure_Max_Objects(_number_FP_tasks) * CONTEXT_FP_SIZE) + \
     
    18611688
    18621689/**
    1863  *  This accounts for any extra memory required by the ITRON API
    1864  *  Initialization Task.
    1865  */
    1866 #if defined(RTEMS_ITRON_API) && \
    1867     (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE > CONFIGURE_MINIMUM_TASK_STACK_SIZE)
    1868   #define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART \
    1869       (CONFIGURE_ITRON_INIT_TASK_STACK_SIZE - CONFIGURE_MINIMUM_TASK_STACK_SIZE)
    1870 #else
    1871   #define CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART 0
    1872 #endif
    1873 
    1874 /**
    18751690 *  This macro provides a summation of the various initialization task
    18761691 *  and thread stack requirements.
     
    18781693#define CONFIGURE_INITIALIZATION_THREADS_STACKS \
    18791694    (CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART + \
    1880     CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART + \
    1881     CONFIGURE_INITIALIZATION_THREADS_STACKS_ITRON_PART)
     1695    CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART)
    18821696
    18831697/**
     
    18871701#define CONFIGURE_TOTAL_TASKS_AND_THREADS \
    18881702   (CONFIGURE_MAXIMUM_TASKS + \
    1889     CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS + \
    1890     CONFIGURE_MAXIMUM_ITRON_TASKS \
    1891    )
     1703    CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS)
    18921704
    18931705/**
     
    19371749    uint32_t CLASSIC;
    19381750    uint32_t POSIX;
    1939     uint32_t ITRON;
    19401751
    19411752    /* System overhead pieces */
     
    19701781    uint32_t POSIX_RWLOCKS;
    19711782#endif
    1972 #ifdef RTEMS_ITRON_API
    1973     /* ITRON API Pieces */
    1974     uint32_t ITRON_SEMAPHORES;
    1975     uint32_t ITRON_EVENTFLAGS;
    1976     uint32_t ITRON_MAILBOXES;
    1977     uint32_t ITRON_MESSAGE_BUFFERS;
    1978     uint32_t ITRON_PORTS;
    1979     uint32_t ITRON_MEMORY_POOLS;
    1980     uint32_t ITRON_FIXED_MEMORY_POOLS;
    1981 #endif
    19821783  } Configuration_Debug_t;
    19831784
     
    19911792    CONFIGURE_MEMORY_FOR_CLASSIC,
    19921793    CONFIGURE_MEMORY_FOR_POSIX,
    1993     CONFIGURE_MEMORY_FOR_ITRON,
    19941794
    19951795    /* System overhead pieces */
     
    20281828    CONFIGURE_MEMORY_FOR_POSIX_TIMERS( CONFIGURE_MAXIMUM_POSIX_TIMERS ),
    20291829#endif
    2030 
    2031 #ifdef RTEMS_ITRON_API
    2032     /* ITRON API Pieces */
    2033     CONFIGURE_MEMORY_FOR_ITRON_SEMAPHORES( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES ),
    2034     CONFIGURE_MEMORY_FOR_ITRON_EVENTFLAGS( CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS ),
    2035     CONFIGURE_MEMORY_FOR_ITRON_MAILBOXES( CONFIGURE_MAXIMUM_ITRON_MAILBOXES ),
    2036     CONFIGURE_MEMORY_FOR_ITRON_MESSAGE_BUFFERS(
    2037         CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS ),
    2038     CONFIGURE_MEMORY_FOR_ITRON_PORTS( CONFIGURE_MAXIMUM_ITRON_PORTS ),
    2039     CONFIGURE_MEMORY_FOR_ITRON_MEMORY_POOLS(
    2040         CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS ),
    2041     CONFIGURE_MEMORY_FOR_ITRON_FIXED_MEMORY_POOLS(
    2042         CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS ),
    2043 #endif
    20441830  };
    20451831#endif
     
    20571843   CONFIGURE_MEMORY_FOR_POSIX + \
    20581844   (CONFIGURE_MAXIMUM_POSIX_THREADS * CONFIGURE_MINIMUM_TASK_STACK_SIZE ) + \
    2059    CONFIGURE_MEMORY_FOR_ITRON + \
    20601845   CONFIGURE_INITIALIZATION_THREADS_STACKS + \
    20611846   CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS + \
     
    21101895  #endif
    21111896
    2112   #ifdef RTEMS_ITRON_API
    2113     /**
    2114      *  This is the ITRON API Configuration Table.
    2115      */
    2116     itron_api_configuration_table Configuration_ITRON_API = {
    2117       CONFIGURE_MAXIMUM_ITRON_TASKS,
    2118       CONFIGURE_MAXIMUM_ITRON_SEMAPHORES,
    2119       CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS,
    2120       CONFIGURE_MAXIMUM_ITRON_MAILBOXES,
    2121       CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS,
    2122       CONFIGURE_MAXIMUM_ITRON_PORTS,
    2123       CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS,
    2124       CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS,
    2125       CONFIGURE_ITRON_INIT_TASK_TABLE_SIZE,
    2126       CONFIGURE_ITRON_INIT_TASK_TABLE_NAME
    2127     };
    2128   #endif
    2129 
    21301897  /** This variable specifies the minimum stack size for tasks in an RTEMS
    21311898   *  application.
     
    22091976#endif
    22101977
    2211 /*
    2212  *  If the user has configured a set of ITRON Initialization Tasks,
    2213  *  then we need to install the code that runs that loop.
    2214  */
    2215 #ifdef RTEMS_ITRON_API
    2216   #ifdef CONFIGURE_INIT
    2217     #if defined(CONFIGURE_ITRON_INIT_TASK_TABLE) || \
    2218         defined(CONFIGURE_ITRON_HAS_OWN_INIT_TASK_TABLE)
    2219       void _ITRON_Task_Initialize_user_tasks_body(void);
    2220       void (*_ITRON_Initialize_user_tasks_p)(void) =
    2221                 _ITRON_Task_Initialize_user_tasks_body;
    2222     #else
    2223       void (*_ITRON_Initialize_user_tasks_p)(void) = NULL;
    2224     #endif
    2225   #endif
    2226 #endif
    2227 
    22281978#ifdef __cplusplus
    22291979}
     
    22502000  #if (CONFIGURE_MAXIMUM_TASKS == 0) && \
    22512001      (CONFIGURE_MAXIMUM_POSIX_THREADS == 0) && \
    2252       (CONFIGURE_MAXIMUM_ADA_TASKS == 0) &&  \
    2253       (CONFIGURE_MAXIMUM_ITRON_TASKS == 0)
     2002      (CONFIGURE_MAXIMUM_ADA_TASKS == 0)
    22542003    #error "CONFIGURATION ERROR: No tasks or threads configured!!"
    22552004  #endif
     
    22622011#if !defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) && \
    22632012    !defined(CONFIGURE_POSIX_INIT_THREAD_TABLE) && \
    2264     !defined(CONFIGURE_ITRON_INIT_TASK_TABLE) && \
    22652013    !defined(CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION)
    22662014#error "CONFIGURATION ERROR: No initialization tasks or threads configured!!"
     
    22992047
    23002048/*
    2301  *  If an attempt was made to configure ITRON objects and
    2302  *  the ITRON API was not configured into RTEMS, error out.
    2303  */
    2304 #if !defined(RTEMS_ITRON_API)
    2305   #if ((CONFIGURE_MAXIMUM_ITRON_TASKS != 0) || \
    2306        (CONFIGURE_MAXIMUM_ITRON_SEMAPHORES != 0) || \
    2307        (CONFIGURE_MAXIMUM_ITRON_EVENTFLAGS != 0) || \
    2308        (CONFIGURE_MAXIMUM_ITRON_MAILBOXES != 0) || \
    2309        (CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS != 0) || \
    2310        (CONFIGURE_MAXIMUM_ITRON_PORTS != 0) || \
    2311        (CONFIGURE_MAXIMUM_ITRON_MEMORY_POOLS != 0) || \
    2312        (CONFIGURE_MAXIMUM_ITRON_FIXED_MEMORY_POOLS != 0) || \
    2313       defined(CONFIGURE_ITRON_INIT_TASK_TABLE))
    2314   #error "CONFIGURATION ERROR: ITRON API support not configured!!"
    2315   #endif
    2316 #endif
    2317 
    2318 /*
    23192049 *  You must either explicity include or exclude the clock driver.
    23202050 *  It is such a common newbie error to leave it out.  Maybe this
Note: See TracChangeset for help on using the changeset viewer.