config: Add <rtems/confdefs/wkspacesupport.h>

Remove all comments and copyrightable content from the moved content.
Use BSD-2-Clause license for new file.

Update #3053.
Update #3875.

3 files changed, 66 insertions, 25 deletions

diff --git a/cpukit/headers.am b/cpukit/headers.am
index d057c6e7d2..5b189a6641 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -202,6 +202,7 @@ include_rtems_confdefs_HEADERS += include/rtems/confdefs/percpu.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/scheduler.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/threads.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/unlimited.h
+include_rtems_confdefs_HEADERS += include/rtems/confdefs/wkspacesupport.h
 include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-bsp.h
 include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-remote.h
 include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-server.h
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index ef1200419b..97e5b6d9fb 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -54,6 +54,7 @@
 #include <rtems/confdefs/percpu.h>
 #include <rtems/confdefs/scheduler.h>
 #include <rtems/confdefs/threads.h>
+#include <rtems/confdefs/wkspacesupport.h>
 
 #include <limits.h>
 
@@ -101,31 +102,6 @@ extern "C" {
 /**@{*/
 
 /**
- * Zero of one returns 0 if the parameter is 0 else 1 is returned.
- */
-#define _Configure_Zero_or_One(_number) ((_number) != 0 ? 1 : 0)
-
-/**
- * General helper to align up a value.
- */
-#define _Configure_Align_up(_val, _align) \
-  (((_val) + (_align) - 1) - ((_val) + (_align) - 1) % (_align))
-
-#define _CONFIGURE_HEAP_MIN_BLOCK_SIZE \
-  _Configure_Align_up(sizeof(Heap_Block), CPU_HEAP_ALIGNMENT)
-
-/**
- * This is a helper macro used in calculations in this file.  It is used
- * to noted when an element is allocated from the RTEMS Workspace and adds
- * a factor to account for heap overhead plus an alignment factor that
- * may be applied.
- */
-#define _Configure_From_workspace(_size) \
-  (uintptr_t) (_Configure_Zero_or_One(_size) * \
-    _Configure_Align_up(_size + HEAP_BLOCK_HEADER_SIZE, \
-      _CONFIGURE_HEAP_MIN_BLOCK_SIZE))
-
-/**
  * This is a helper macro used in stack space calculations in this file.  It
  * may be provided by the application in case a special task stack allocator
  * is used.  The default is allocation from the RTEMS Workspace.
diff --git a/cpukit/include/rtems/confdefs/wkspacesupport.h b/cpukit/include/rtems/confdefs/wkspacesupport.h
new file mode 100644
index 0000000000..3dfb3b0d79
--- /dev/null
+++ b/cpukit/include/rtems/confdefs/wkspacesupport.h
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSApplicationConfiguration
+ *
+ * @brief Configuration Options Workspace Support Macros
+ */
+
+/*
+ * 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.
+ */
+
+#ifndef _RTEMS_CONFDEFS_WKSPACESUPPORT_H
+#define _RTEMS_CONFDEFS_WKSPACESUPPORT_H
+
+#ifndef __CONFIGURATION_TEMPLATE_h
+#error "Do not include this file directly, use <rtems/confdefs.h> instead"
+#endif
+
+#ifdef CONFIGURE_INIT
+
+#include <rtems/score/heap.h>
+
+#define _Configure_Zero_or_one( _number ) ( ( _number ) != 0 ? 1 : 0 )
+
+#define _Configure_Align_up( _val, _align ) \
+  ( ( ( _val ) + ( _align ) - 1) - ( ( _val ) + ( _align ) - 1 ) % ( _align ) )
+
+#define _CONFIGURE_HEAP_MIN_BLOCK_SIZE \
+  _Configure_Align_up( sizeof( Heap_Block ), CPU_HEAP_ALIGNMENT )
+
+#define _Configure_From_workspace( _size ) \
+  ( (uintptr_t) ( _Configure_Zero_or_one( _size ) \
+    * _Configure_Align_up( \
+       _size + HEAP_BLOCK_HEADER_SIZE, \
+      _CONFIGURE_HEAP_MIN_BLOCK_SIZE \
+    ) ) )
+
+#endif /* CONFIGURE_INIT */
+
+#endif /* _RTEMS_CONFDEFS_WKSPACESUPPORT_H */