[PATCH v2 35/44] config: Add <rtems/confdefs/inittask.h>
Sebastian Huber
sebastian.huber at embedded-brains.de
Fri Feb 21 10:52:47 UTC 2020
Remove all comments and copyrightable content from the moved content.
Use BSD-2-Clause license for new file.
Update #3053.
Update #3875.
---
cpukit/headers.am | 1 +
cpukit/include/rtems/confdefs.h | 130 +-----------------------------
cpukit/include/rtems/confdefs/inittask.h | 131 +++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+), 128 deletions(-)
create mode 100644 cpukit/include/rtems/confdefs/inittask.h
diff --git a/cpukit/headers.am b/cpukit/headers.am
index 7bcc7be6ca..ae235a3f32 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -187,6 +187,7 @@ include_rtems_confdefs_HEADERS += include/rtems/confdefs/bdbuf.h
include_rtems_confdefs_HEADERS += include/rtems/confdefs/bsp.h
include_rtems_confdefs_HEADERS += include/rtems/confdefs/clock.h
include_rtems_confdefs_HEADERS += include/rtems/confdefs/extensions.h
+include_rtems_confdefs_HEADERS += include/rtems/confdefs/inittask.h
include_rtems_confdefs_HEADERS += include/rtems/confdefs/libio.h
include_rtems_confdefs_HEADERS += include/rtems/confdefs/libpci.h
include_rtems_confdefs_HEADERS += include/rtems/confdefs/malloc.h
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index b0783ae225..d31c125f7e 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -51,6 +51,7 @@
#include <rtems/confdefs/bdbuf.h>
#include <rtems/confdefs/clock.h>
#include <rtems/confdefs/extensions.h>
+#include <rtems/confdefs/inittask.h>
#include <rtems/confdefs/libio.h>
#include <rtems/confdefs/libpci.h>
#include <rtems/confdefs/malloc.h>
@@ -143,98 +144,6 @@ extern "C" {
#endif
/**@}*/
-/**
- * @defgroup ConfigurationInitTasksTable Initialization Tasks Configuration
- *
- * @addtogroup Configuration
- *
- * This group contains the elements needed to define the Classic API
- * Initialization Tasks Table.
- *
- * Default User Initialization Task Table. This table guarantees that
- * one user initialization table is defined.
- */
-#if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE)
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the name of the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_NAME
- #define CONFIGURE_INIT_TASK_NAME rtems_build_name('U', 'I', '1', ' ')
-#endif
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the stack size of the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_STACK_SIZE
- #define CONFIGURE_INIT_TASK_STACK_SIZE CONFIGURE_MINIMUM_TASK_STACK_SIZE
-#endif
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the priority of the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_PRIORITY
- #define CONFIGURE_INIT_TASK_PRIORITY 1
-#endif
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the attributes size of the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_ATTRIBUTES
- #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES
-#endif
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the entry point of the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_ENTRY_POINT
- #ifdef __cplusplus
- extern "C" {
- #endif
- rtems_task Init (rtems_task_argument );
- #ifdef __cplusplus
- }
- #endif
- #define CONFIGURE_INIT_TASK_ENTRY_POINT Init
- extern const char* bsp_boot_cmdline;
- #define CONFIGURE_INIT_TASK_ARGUMENTS ((rtems_task_argument) &bsp_boot_cmdline)
-#endif
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the initial execution mode of the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_INITIAL_MODES
- #ifdef RTEMS_SMP
- #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
- #else
- #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT
- #endif
-#endif
-
-/**
- * When using the default Classic API Initialization Tasks Table, this is
- * used to specify the initial argument to the single Classic API task.
- */
-#ifndef CONFIGURE_INIT_TASK_ARGUMENTS
- #define CONFIGURE_INIT_TASK_ARGUMENTS 0
-#endif
-
-#else /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
-
-/*
- * This is the stack size of the Initialization Task when none is configured.
- */
-#define CONFIGURE_INIT_TASK_STACK_SIZE 0
-
-#endif
-/**@}*/ /* end of Classic API Initialization Tasks Table */
-
/**
* @defgroup ConfigurationDriverTable Device Driver Table Configuration
*
@@ -796,17 +705,6 @@ extern "C" {
* may have requested.
*/
-/*
- * This accounts for any extra memory required by the Classic API
- * Initialization Task.
- */
-#if (CONFIGURE_INIT_TASK_STACK_SIZE > CONFIGURE_MINIMUM_TASK_STACK_SIZE)
- #define _CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART \
- (CONFIGURE_INIT_TASK_STACK_SIZE - CONFIGURE_MINIMUM_TASK_STACK_SIZE)
-#else
- #define _CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART 0
-#endif
-
/*
* This accounts for any extra memory required by the POSIX API
* Initialization Thread.
@@ -825,7 +723,7 @@ extern "C" {
* and thread stack requirements.
*/
#define _CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS \
- (_CONFIGURE_INITIALIZATION_THREADS_STACKS_CLASSIC_PART + \
+ (_CONFIGURE_INIT_TASK_STACK_EXTRA + \
_CONFIGURE_INITIALIZATION_THREADS_STACKS_POSIX_PART)
/*
@@ -1156,30 +1054,6 @@ extern "C" {
#endif
#endif
-/*
- * If the user has configured a set of Classic API Initialization Tasks,
- * then we need to install the code that runs that loop.
- */
-#ifdef CONFIGURE_INIT
- #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE)
- const rtems_initialization_tasks_table _RTEMS_tasks_User_task_table = {
- CONFIGURE_INIT_TASK_NAME,
- CONFIGURE_INIT_TASK_STACK_SIZE,
- CONFIGURE_INIT_TASK_PRIORITY,
- CONFIGURE_INIT_TASK_ATTRIBUTES,
- CONFIGURE_INIT_TASK_ENTRY_POINT,
- CONFIGURE_INIT_TASK_INITIAL_MODES,
- CONFIGURE_INIT_TASK_ARGUMENTS
- };
-
- RTEMS_SYSINIT_ITEM(
- _RTEMS_tasks_Initialize_user_task,
- RTEMS_SYSINIT_CLASSIC_USER_TASKS,
- RTEMS_SYSINIT_ORDER_MIDDLE
- );
- #endif
-#endif
-
/*
* If the user has configured a set of POSIX Initialization Threads,
* then we need to install the code that runs that loop.
diff --git a/cpukit/include/rtems/confdefs/inittask.h b/cpukit/include/rtems/confdefs/inittask.h
new file mode 100644
index 0000000000..8705d962c7
--- /dev/null
+++ b/cpukit/include/rtems/confdefs/inittask.h
@@ -0,0 +1,131 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSApplicationConfiguration
+ *
+ * @brief Evaluate User Initialization Task Configuration Options
+ *
+ * This header file defines _CONFIGURE_INIT_TASK_STACK_EXTRA for use by other
+ * configuration header files.
+ */
+
+#ifndef _RTEMS_CONFDEFS_INITTASK_H
+#define _RTEMS_CONFDEFS_INITTASK_H
+
+#ifndef __CONFIGURATION_TEMPLATE_h
+#error "Do not include this file directly, use <rtems/confdefs.h> instead"
+#endif
+
+#ifdef CONFIGURE_INIT
+
+#ifdef CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#include <rtems/confdefs/percpu.h>
+#include <rtems/rtems/object.h>
+#include <rtems/rtems/tasksdata.h>
+#include <rtems/sysinit.h>
+
+#ifndef CONFIGURE_INIT_TASK_NAME
+ #define CONFIGURE_INIT_TASK_NAME rtems_build_name( 'U', 'I', '1', ' ' )
+#endif
+
+#ifndef CONFIGURE_INIT_TASK_STACK_SIZE
+ #define CONFIGURE_INIT_TASK_STACK_SIZE CONFIGURE_MINIMUM_TASK_STACK_SIZE
+#endif
+
+#if CONFIGURE_INIT_TASK_STACK_SIZE > CONFIGURE_MINIMUM_TASK_STACK_SIZE
+ #define _CONFIGURE_INIT_TASK_STACK_EXTRA \
+ ( CONFIGURE_INIT_TASK_STACK_SIZE - CONFIGURE_MINIMUM_TASK_STACK_SIZE )
+#endif
+
+#ifndef CONFIGURE_INIT_TASK_PRIORITY
+ #define CONFIGURE_INIT_TASK_PRIORITY 1
+#endif
+
+#ifndef CONFIGURE_INIT_TASK_ATTRIBUTES
+ #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES
+#endif
+
+#ifndef CONFIGURE_INIT_TASK_INITIAL_MODES
+ #ifdef RTEMS_SMP
+ #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
+ #else
+ #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT
+ #endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef CONFIGURE_INIT_TASK_ENTRY_POINT
+ rtems_task Init( rtems_task_argument );
+ #define CONFIGURE_INIT_TASK_ENTRY_POINT Init
+
+ #ifndef CONFIGURE_INIT_TASK_ARGUMENTS
+ extern const char *bsp_boot_cmdline;
+ #define CONFIGURE_INIT_TASK_ARGUMENTS \
+ ( (rtems_task_argument) &bsp_boot_cmdline )
+ #endif
+#endif
+
+#ifndef CONFIGURE_INIT_TASK_ARGUMENTS
+ #define CONFIGURE_INIT_TASK_ARGUMENTS 0
+#endif
+
+const rtems_initialization_tasks_table _RTEMS_tasks_User_task_table = {
+ CONFIGURE_INIT_TASK_NAME,
+ CONFIGURE_INIT_TASK_STACK_SIZE,
+ CONFIGURE_INIT_TASK_PRIORITY,
+ CONFIGURE_INIT_TASK_ATTRIBUTES,
+ CONFIGURE_INIT_TASK_ENTRY_POINT,
+ CONFIGURE_INIT_TASK_INITIAL_MODES,
+ CONFIGURE_INIT_TASK_ARGUMENTS
+};
+
+RTEMS_SYSINIT_ITEM(
+ _RTEMS_tasks_Initialize_user_task,
+ RTEMS_SYSINIT_CLASSIC_USER_TASKS,
+ RTEMS_SYSINIT_ORDER_MIDDLE
+);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
+
+#ifndef _CONFIGURE_INIT_TASK_STACK_EXTRA
+ #define _CONFIGURE_INIT_TASK_STACK_EXTRA 0
+#endif
+
+#endif /* CONFIGURE_INIT */
+
+#endif /* _RTEMS_CONFDEFS_INITTASK_H */
--
2.16.4
More information about the devel
mailing list