Move the unified workspace configuration constant out of the
configuration table.
Provide a default definition of the unified workspace constant.
Update #3875.
---
cpukit/Makefile.am | 1 +
cpukit/include/rtems/confdefs.h | 9 ++++----
cpukit/include/rtems/config.h | 10 +--------
cpukit/include/rtems/score/wkspacedata.h | 8 +++++++
cpukit/score/src/wkspaceisunifieddefault.c | 34 ++++++++++++++++++++++++++++++
5 files changed, 48 insertions(+), 14 deletions(-)
create mode 100644 cpukit/score/src/wkspaceisunifieddefault.c
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 42e16d71e6..189f525b7d 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1014,6 +1014,7 @@ librtemscpu_a_SOURCES +=
score/src/debugisthreaddispatchingallowed.c
librtemscpu_a_SOURCES += score/src/interr.c
librtemscpu_a_SOURCES += score/src/isr.c
librtemscpu_a_SOURCES += score/src/wkspace.c
+librtemscpu_a_SOURCES += score/src/wkspaceisunifieddefault.c
librtemscpu_a_SOURCES += score/src/wkstringduplicate.c
librtemscpu_a_SOURCES += score/src/ioprintf.c
librtemscpu_a_SOURCES += score/src/iovprintf.c
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 6057bf4ac5..33b1aa67d4 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -2637,11 +2637,6 @@ struct _reent *__getreent(void)
* This is the primary Configuration Table for this application.
*/
const rtems_configuration_table Configuration = {
- #ifdef CONFIGURE_UNIFIED_WORK_AREAS /* true for unified work areas */
- true,
- #else
- false,
- #endif
#ifdef RTEMS_SMP
#ifdef _CONFIGURE_SMP_APPLICATION
true,
@@ -2656,6 +2651,10 @@ struct _reent *__getreent(void)
const uintptr_t _Workspace_Size = CONFIGURE_EXECUTIVE_RAM_SIZE;
+ #ifdef CONFIGURE_UNIFIED_WORK_AREAS
+ const bool _Workspace_Is_unified = true;
+ #endif
+
#ifdef CONFIGURE_DIRTY_MEMORY
RTEMS_SYSINIT_ITEM(
_Memory_Dirty_free_areas,
diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h
index 0b5527c76d..6489e4e4e8 100644
--- a/cpukit/include/rtems/config.h
+++ b/cpukit/include/rtems/config.h
@@ -83,14 +83,6 @@ typedef Stack_Allocator_free rtems_stack_free_hook;
* + required number of each object type for each API configured
*/
typedef struct {
- /**
- * @brief Specifies if a unified work area is used or not.
- *
- * If this element is @a true, then the RTEMS Workspace and the C Program
- * Heap use the same heap, otherwise they use separate heaps.
- */
- bool unified_work_area;
-
#ifdef RTEMS_SMP
bool smp_enabled;
#endif
@@ -111,7 +103,7 @@ extern const rtems_configuration_table Configuration;
*/
#define rtems_configuration_get_unified_work_area() \
- (Configuration.unified_work_area)
+ (_Workspace_Is_unified)
/**
* @brief Return if the stack allocator avoids the work space.
diff --git a/cpukit/include/rtems/score/wkspacedata.h
b/cpukit/include/rtems/score/wkspacedata.h
index b913c07f8e..9535890dc8 100644
--- a/cpukit/include/rtems/score/wkspacedata.h
+++ b/cpukit/include/rtems/score/wkspacedata.h
@@ -57,6 +57,14 @@ extern "C" {
*/
extern const uintptr_t _Workspace_Size;
+/**
+ * @brief Indicates if the workspace and C program heap are unified.
+ *
+ * This constant is defined by the application configuration via
+ * <rtems/confdefs.h>.
+ */
+extern const bool _Workspace_Is_unified;
+
/** @} */
#ifdef __cplusplus
diff --git a/cpukit/score/src/wkspaceisunifieddefault.c
b/cpukit/score/src/wkspaceisunifieddefault.c
new file mode 100644
index 0000000000..80b79622a6
--- /dev/null
+++ b/cpukit/score/src/wkspaceisunifieddefault.c
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/score/wkspacedata.h>
+
+const bool _Workspace_Is_unified = false;
--
2.16.4
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
