Changeset 6b0873f in rtems


Ignore:
Timestamp:
Feb 14, 2020, 7:40:41 AM (5 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
5, master
Children:
9520ec3
Parents:
77ee827
git-author:
Sebastian Huber <sebastian.huber@…> (02/14/20 07:40:41)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/25/20 06:15:18)
Message:

config: Remove CONFIGURE_HAS_OWN_INIT_TASK_TABLE

The CONFIGURE_HAS_OWN_INIT_TASK_TABLE and
CONFIGURE_POSIX_HAS_OWN_INIT_THREAD_TABLE are the last *_HAS_OWN_*
configuration options. These two options are probably unused, see also:

Removing them simplifies the configuration. If there is a real user need
which shows up after the removal, we can resurrect them on demand.

Using CONFIGURE_HAS_OWN_INIT_TASK_TABLE would have required the use of
the undocumented CONFIGURE_INIT_TASK_TABLE and
CONFIGURE_INIT_TASK_TABLE_SIZE configuration options.

Update #3873.

Files:
7 edited

Legend:

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

    r77ee827 r6b0873f  
    12911291 * Default User Initialization Task Table.  This table guarantees that
    12921292 * one user initialization table is defined.
    1293  *
    1294  *  WHEN CONFIGURE_HAS_OWN_INIT_TASK_TABLE is defined, the user is
    1295  *  responsible for defining their own table information and setting the
    1296  *  appropriate variables.
    1297  */
    1298 #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) && \
    1299     !defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE)
     1293 */
     1294#if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE)
    13001295
    13011296/**
     
    13931388
    13941389#else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
    1395 #ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    1396 
    1397 /*
    1398  * The user application is responsible for defining everything
    1399  * when CONFIGURE_HAS_OWN_INIT_TABLE is defined.
    1400  */
    1401 #else     /* not using standard or providing own Init Task Table */
    14021390
    14031391/*
     
    14151403 */
    14161404#define CONFIGURE_INIT_TASK_STACK_SIZE 0
    1417 
    1418 #endif    /* CONFIGURE_HAS_OWN_INIT_TASK_TABLE */
    14191405
    14201406#endif
     
    27932779 */
    27942780#ifdef CONFIGURE_INIT
    2795   #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) || \
    2796       defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE)
     2781  #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE)
    27972782    RTEMS_SYSINIT_ITEM(
    27982783      _RTEMS_tasks_Initialize_user_tasks_body,
     
    29872972#endif
    29882973
     2974#ifdef CONFIGURE_HAS_OWN_INIT_TABLE
     2975  #warning "The CONFIGURE_HAS_OWN_INIT_TABLE configuration option is obsolete since RTEMS 5.1"
     2976#endif
     2977
    29892978#ifdef CONFIGURE_HAS_OWN_MOUNT_TABLE
    29902979  #warning "The CONFIGURE_HAS_OWN_MOUNT_TABLE configuration option is obsolete since RTEMS 5.1"
  • testsuites/sptests/sp54/init.c

    r77ee827 r6b0873f  
    2525static void *Init( uintptr_t ignored )
    2626{
    27   rtems_status_code    status;
    28   rtems_task_priority  pri;
    29   rtems_id             id;
     27  rtems_status_code                    status;
     28  rtems_task_priority                  pri;
     29  rtems_id                             id;
     30  const rtems_api_configuration_table *config;
    3031
    3132  /*
     
    5354  rtems_test_assert( rtems_configuration_get_do_zero_of_workspace() );
    5455
     56  config = rtems_configuration_get_rtems_api_configuration();
     57  rtems_test_assert( config->number_of_initialization_tasks == 0 );
     58  rtems_test_assert( config->User_initialization_tasks_table == NULL );
     59
    5560  TEST_END();
    5661  rtems_test_exit(0);
     
    6974#define CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION
    7075
    71 /*
    72  *  Another odd case to hit.  Since we use the Init task is Idle task
    73  *  configuration, we can dummy up the initialization task configuration
    74  *  to have a non-NULL pointer and 0 tasks.
    75  */
    76 
    77 #define CONFIGURE_HAS_OWN_INIT_TASK_TABLE 1
    78 
    79 rtems_initialization_tasks_table Initialization_tasks[1] =
    80   { { 0, }};
    81 
    82 #define CONFIGURE_INIT_TASK_TABLE      Initialization_tasks
    83 #define CONFIGURE_INIT_TASK_TABLE_SIZE 0
    84 #define CONFIGURE_INIT_TASK_STACK_SIZE 0
    85 
    8676#define CONFIGURE_DIRTY_MEMORY
    8777
  • testsuites/sptests/spfatal01/init.c

    r77ee827 r6b0873f  
    99 */
    1010
    11 /*
    12  *  Way too much stack space.  Should generate a fatal error
    13  *  on the init task create.
    14  */
    15 #define CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    16 #define CONFIGURE_INIT_TASK_STACK_SIZE 0
    17 rtems_initialization_tasks_table Initialization_tasks[] = {
    18   { rtems_build_name('I', 'N', 'I', ' '),
    19     32UL * 1024UL,
    20     1,
    21     RTEMS_DEFAULT_ATTRIBUTES,
    22     Init,
    23     RTEMS_DEFAULT_MODES,
    24     0
    25   }
    26 };
    27 #define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
    28 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
    29   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
    30 
    3111#define FATAL_ERROR_TEST_NAME            "1"
    3212#define FATAL_ERROR_DESCRIPTION          "Classic API Init task create failure"
    3313#define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_CORE
    3414#define FATAL_ERROR_EXPECTED_ERROR       INTERNAL_ERROR_RTEMS_INIT_TASK_CREATE_FAILED
     15
     16static void *stack_allocator(size_t unused)
     17{
     18  return NULL;
     19}
     20
     21static void stack_deallocator(void *unused)
     22{
     23}
     24
     25#define CONFIGURE_TASK_STACK_ALLOCATOR stack_allocator
     26
     27#define CONFIGURE_TASK_STACK_DEALLOCATOR stack_deallocator
    3528
    3629static void force_error(void)
  • testsuites/sptests/spfatal02/init.c

    r77ee827 r6b0873f  
    99 */
    1010
    11 /*
    12  *  Way too much stack space.  Should generate a fatal error
    13  *  on the init task create.
    14  */
    15 #define CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    16 #define CONFIGURE_INIT_TASK_STACK_SIZE   RTEMS_MINIMUM_STACK_SIZE
    17 rtems_initialization_tasks_table Initialization_tasks[] = {
    18   { rtems_build_name('I', 'N', 'I', ' '),
    19     RTEMS_MINIMUM_STACK_SIZE,
    20     1,
    21     RTEMS_DEFAULT_ATTRIBUTES,
    22     NULL,
    23     RTEMS_DEFAULT_MODES,
    24     0
    25   }
    26 };
    27 #define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
    28 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
    29   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
     11#define CONFIGURE_INIT_TASK_ENTRY_POINT NULL
    3012
    3113#define FATAL_ERROR_TEST_NAME            "2"
  • testsuites/sptests/spfatal04/init.c

    r77ee827 r6b0873f  
    88 * Classic API Init task create failure
    99 */
    10 
    11 /*
    12  *  Way too much stack space.  Should generate a fatal error
    13  *  on the init task create.
    14  */
    15 #define CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    16 #define CONFIGURE_INIT_TASK_STACK_SIZE   RTEMS_MINIMUM_STACK_SIZE
    17 rtems_initialization_tasks_table Initialization_tasks[] = {
    18   { rtems_build_name('I', 'N', 'I', ' '),
    19     RTEMS_MINIMUM_STACK_SIZE,
    20     1,
    21     RTEMS_DEFAULT_ATTRIBUTES,
    22     Init,
    23     RTEMS_DEFAULT_MODES,
    24     0
    25   }
    26 };
    27 #define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
    28 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
    29   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
    3010
    3111#define FATAL_ERROR_TEST_NAME            "4"
  • testsuites/sptests/spfatal05/init.c

    r77ee827 r6b0873f  
    1515 *  http://www.rtems.org/license/LICENSE.
    1616 */
    17 
    18 /*
    19  *  Way too much stack space.  Should generate a fatal error
    20  *  on the init task create.
    21  */
    22 #define CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    23 #define CONFIGURE_INIT_TASK_STACK_SIZE   RTEMS_MINIMUM_STACK_SIZE
    24 rtems_initialization_tasks_table Initialization_tasks[] = {
    25   { rtems_build_name('I', 'N', 'I', ' '),
    26     RTEMS_MINIMUM_STACK_SIZE,
    27     1,
    28     RTEMS_DEFAULT_ATTRIBUTES,
    29     Init,
    30     RTEMS_DEFAULT_MODES,
    31     0
    32   }
    33 };
    34 #define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
    35 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
    36   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
    3717
    3818#define SPFATAL_TEST_CASE_EXTRA_TASKS 1
  • testsuites/sptests/spfatal06/init.c

    r77ee827 r6b0873f  
    1616 */
    1717
    18 /*
    19  *  Way too much stack space.  Should generate a fatal error
    20  *  on the init task create.
    21  */
    22 #define CONFIGURE_HAS_OWN_INIT_TASK_TABLE
    23 #define CONFIGURE_INIT_TASK_STACK_SIZE   RTEMS_MINIMUM_STACK_SIZE
    24 rtems_initialization_tasks_table Initialization_tasks[] = {
    25   { rtems_build_name('I', 'N', 'I', ' '),
    26     RTEMS_MINIMUM_STACK_SIZE,
    27     1,
    28     RTEMS_DEFAULT_ATTRIBUTES,
    29     Init,
    30     RTEMS_DEFAULT_MODES,
    31     0
    32   }
    33 };
    34 #define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
    35 #define CONFIGURE_INIT_TASK_TABLE_SIZE \
    36   sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
    37 
    3818#define FATAL_ERROR_TEST_NAME            "6"
    3919#define FATAL_ERROR_DESCRIPTION \
     
    4222#define FATAL_ERROR_EXPECTED_ERROR       INTERNAL_ERROR_BAD_STACK_HOOK
    4323
    44 void *New_stack_allocate_hook(size_t unused);
    45 
    4624#define CONFIGURE_TASK_STACK_ALLOCATOR New_stack_allocate_hook
    4725
    4826#define CONFIGURE_TASK_STACK_DEALLOCATOR NULL
    4927
    50 void *New_stack_allocate_hook(size_t unused)
     28static void *New_stack_allocate_hook(size_t unused)
    5129{
    5230  return NULL;
Note: See TracChangeset for help on using the changeset viewer.