Changeset c232b37 in rtems


Ignore:
Timestamp:
Feb 19, 2018, 7:05:57 PM (3 years ago)
Author:
Joel Sherrill <joel@…>
Branches:
5, master
Children:
40c623a8
Parents:
dad79bb9
git-author:
Joel Sherrill <joel@…> (02/19/18 19:05:57)
git-committer:
Joel Sherrill <joel@…> (02/19/18 19:06:46)
Message:

confdefs.h: Minor rework to avoid warnings when CONFIGURE_HAS_OWN_INIT_TABLE

CONFIGURE_HAS_OWN_INIT_TABLE was used both with and without
defining CONFIGURE_RTEMS_INIT_TASKS_TABLE. This rework allows
it to work both ways without warnings.

File:
1 edited

Legend:

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

    rdad79bb9 rc232b37  
    13791379 * Initialization Tasks Table.
    13801380 *
    1381  *  Default User Initialization Task Table.  This table guarantees that
    1382  *  one user initialization table is defined.
    1383  */
    1384 #ifdef CONFIGURE_RTEMS_INIT_TASKS_TABLE
    1385 
    1386 #ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    1387 
    1388 /*
    1389  *  The user is defining their own table information and setting the
     1381 * Default User Initialization Task Table.  This table guarantees that
     1382 * one user initialization table is defined.
     1383 *
     1384 *  WHEN CONFIGURE_HAS_OWN_INIT_TASK_TABLE is defined, the user is
     1385 *  responsible for defining their own table information and setting the
    13901386 *  appropriate variables.
    13911387 */
    1392 
    1393 #else
     1388#if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) && \
     1389    !defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE)
    13941390
    13951391/**
     
    14861482  RTEMS_ARRAY_SIZE(CONFIGURE_INIT_TASK_TABLE)
    14871483
     1484#else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
     1485#ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
     1486
     1487/*
     1488 * The user application is responsible for defining everything
     1489 * when CONFIGURE_HAS_OWN_INIT_TABLE is defined.
     1490 */
     1491#else     /* not using standard or providing own Init Task Table */
     1492
     1493/*
     1494 * This is the name of the Initialization Task when none is configured.
     1495 */
     1496#define CONFIGURE_INIT_TASK_TABLE      NULL
     1497
     1498/*
     1499 * This is the size of the Initialization Task when none is configured.
     1500 */
     1501#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
     1502
     1503/*
     1504 * This is the stack size of the Initialization Task when none is configured.
     1505 */
     1506#define CONFIGURE_INIT_TASK_STACK_SIZE 0
     1507
    14881508#endif    /* CONFIGURE_HAS_OWN_INIT_TASK_TABLE */
    1489 
    1490 #else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
    1491 
    1492 /*
    1493  * This is the name of the Initialization Task when none is configured.
    1494  */
    1495 #define CONFIGURE_INIT_TASK_TABLE      NULL
    1496 
    1497 /*
    1498  * This is the size of the Initialization Task when none is configured.
    1499  */
    1500 #define CONFIGURE_INIT_TASK_TABLE_SIZE 0
    1501 
    1502 /*
    1503  * This is the stack size of the Initialization Task when none is configured.
    1504  */
    1505 #define CONFIGURE_INIT_TASK_STACK_SIZE 0
    15061509
    15071510#endif
Note: See TracChangeset for help on using the changeset viewer.