[rtems commit] config: Add <rtems/confdefs/objectsclassic.h>

Sebastian Huber sebh at rtems.org
Tue Feb 25 11:32:19 UTC 2020


Module:    rtems
Branch:    master
Commit:    d20209b06578c3fdfab3eee892dcfbdb6bf64620
Changeset: http://git.rtems.org/rtems/commit/?id=d20209b06578c3fdfab3eee892dcfbdb6bf64620

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Feb 20 13:59:30 2020 +0100

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

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                | 114 +---------------------
 cpukit/include/rtems/confdefs/objectsclassic.h | 127 +++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 113 deletions(-)

diff --git a/cpukit/headers.am b/cpukit/headers.am
index 2a7e5a8..d057c6e 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -196,6 +196,7 @@ include_rtems_confdefs_HEADERS += include/rtems/confdefs/libpci.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/malloc.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/mpci.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/newlib.h
+include_rtems_confdefs_HEADERS += include/rtems/confdefs/objectsclassic.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/obsolete.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/percpu.h
 include_rtems_confdefs_HEADERS += include/rtems/confdefs/scheduler.h
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 82b6f11..ef12004 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -30,14 +30,6 @@
 #include <rtems/score/apimutex.h>
 #include <rtems/score/context.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/rtems/barrierdata.h>
-#include <rtems/rtems/dpmemdata.h>
-#include <rtems/rtems/messagedata.h>
-#include <rtems/rtems/partdata.h>
-#include <rtems/rtems/ratemondata.h>
-#include <rtems/rtems/regiondata.h>
-#include <rtems/rtems/semdata.h>
-#include <rtems/rtems/timerdata.h>
 #include <rtems/posix/key.h>
 #include <rtems/posix/mqueue.h>
 #include <rtems/posix/psignal.h>
@@ -58,6 +50,7 @@
 #include <rtems/confdefs/malloc.h>
 #include <rtems/confdefs/mpci.h>
 #include <rtems/confdefs/newlib.h>
+#include <rtems/confdefs/objectsclassic.h>
 #include <rtems/confdefs/percpu.h>
 #include <rtems/confdefs/scheduler.h>
 #include <rtems/confdefs/threads.h>
@@ -147,76 +140,6 @@ extern "C" {
 /**@}*/
 
 /**
- * @defgroup ConfigurationClassicAPI Classic API Configuration
- *
- * @ingroup Configuration
- *
- * This module contains the parameters related to configuration
- * of the Classic API services.
- */
-/**@{*/
-
-#ifndef CONFIGURE_MAXIMUM_TIMERS
-  /** This specifies the maximum number of Classic API timers. */
-  #define CONFIGURE_MAXIMUM_TIMERS             0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_SEMAPHORES
-  /** This specifies the maximum number of Classic API semaphores. */
-  #define CONFIGURE_MAXIMUM_SEMAPHORES                 0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_MESSAGE_QUEUES
-  /**
-   * This configuration parameter specifies the maximum number of
-   * Classic API Message Queues.
-   */
-  #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES             0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PARTITIONS
-  /**
-   * This configuration parameter specifies the maximum number of
-   * Classic API Partitions.
-   */
-  #define CONFIGURE_MAXIMUM_PARTITIONS                 0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_REGIONS
-  /**
-   * This configuration parameter specifies the maximum number of
-   * Classic API Regions.
-   */
-  #define CONFIGURE_MAXIMUM_REGIONS              0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PORTS
-  /**
-   * This configuration parameter specifies the maximum number of
-   * Classic API Dual-Ported Memory Ports.
-   */
-  #define CONFIGURE_MAXIMUM_PORTS            0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PERIODS
-  /**
-   * This configuration parameter specifies the maximum number of
-   * Classic API Rate Monotonic Periods.
-   */
-  #define CONFIGURE_MAXIMUM_PERIODS              0
-#endif
-
-/**
- * This configuration parameter specifies the maximum number of
- * Classic API Barriers.
- */
-#ifndef CONFIGURE_MAXIMUM_BARRIERS
-  #define CONFIGURE_MAXIMUM_BARRIERS               0
-#endif
-
-/**@}*/ /* end of Classic API Configuration */
-
-/**
  * @defgroup ConfigurationPOSIXAPI POSIX API Configuration Parameters
  *
  * This module contains the parameters related to configuration
@@ -458,41 +381,6 @@ extern "C" {
   )
 
 #ifdef CONFIGURE_INIT
-  #if CONFIGURE_MAXIMUM_BARRIERS > 0
-    BARRIER_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_BARRIERS );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_MESSAGE_QUEUES > 0
-    MESSAGE_QUEUE_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_MESSAGE_QUEUES );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_PARTITIONS > 0
-    PARTITION_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_PARTITIONS );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_PERIODS > 0
-    RATE_MONOTONIC_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_PERIODS );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_PORTS > 0
-    DUAL_PORTED_MEMORY_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_PORTS );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_REGIONS > 0
-    REGION_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_REGIONS );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_SEMAPHORES > 0
-    SEMAPHORE_INFORMATION_DEFINE(
-      CONFIGURE_MAXIMUM_SEMAPHORES,
-      _CONFIGURE_SCHEDULER_COUNT
-    );
-  #endif
-
-  #if CONFIGURE_MAXIMUM_TIMERS > 0
-    TIMER_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_TIMERS );
-  #endif
-
   #if CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS > 0
     POSIX_Keys_Key_value_pair _POSIX_Keys_Key_value_pairs[
       rtems_resource_maximum_per_allocation(
diff --git a/cpukit/include/rtems/confdefs/objectsclassic.h b/cpukit/include/rtems/confdefs/objectsclassic.h
new file mode 100644
index 0000000..ae5ea25
--- /dev/null
+++ b/cpukit/include/rtems/confdefs/objectsclassic.h
@@ -0,0 +1,127 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSApplicationConfiguration
+ *
+ * @brief Evaluate Classic API Objects Configuration Options
+ *
+ * For the task objects configuration see <rtems/confdefs/threads.h>.
+ */
+
+/*
+ * 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_OBJECTSCLASSIC_H
+#define _RTEMS_CONFDEFS_OBJECTSCLASSIC_H
+
+#ifndef __CONFIGURATION_TEMPLATE_h
+#error "Do not include this file directly, use <rtems/confdefs.h> instead"
+#endif
+
+#ifdef CONFIGURE_INIT
+
+#include <rtems/confdefs/unlimited.h>
+
+#if CONFIGURE_MAXIMUM_BARRIERS > 0
+  #include <rtems/rtems/barrierdata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_PORTS > 0
+  #include <rtems/rtems/dpmemdata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_MESSAGE_QUEUES > 0
+  #include <rtems/rtems/messagedata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_PARTITIONS > 0
+  #include <rtems/rtems/partdata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_PERIODS > 0
+  #include <rtems/rtems/ratemondata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_REGIONS > 0
+  #include <rtems/rtems/regiondata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_SEMAPHORES > 0
+  #include <rtems/confdefs/scheduler.h>
+  #include <rtems/rtems/semdata.h>
+#endif
+
+#if CONFIGURE_MAXIMUM_TIMERS > 0
+  #include <rtems/rtems/timerdata.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if CONFIGURE_MAXIMUM_BARRIERS > 0
+  BARRIER_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_BARRIERS );
+#endif
+
+#if CONFIGURE_MAXIMUM_MESSAGE_QUEUES > 0
+  MESSAGE_QUEUE_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_MESSAGE_QUEUES );
+#endif
+
+#if CONFIGURE_MAXIMUM_PARTITIONS > 0
+  PARTITION_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_PARTITIONS );
+#endif
+
+#if CONFIGURE_MAXIMUM_PERIODS > 0
+  RATE_MONOTONIC_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_PERIODS );
+#endif
+
+#if CONFIGURE_MAXIMUM_PORTS > 0
+  DUAL_PORTED_MEMORY_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_PORTS );
+#endif
+
+#if CONFIGURE_MAXIMUM_REGIONS > 0
+  REGION_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_REGIONS );
+#endif
+
+#if CONFIGURE_MAXIMUM_SEMAPHORES > 0
+  SEMAPHORE_INFORMATION_DEFINE(
+    CONFIGURE_MAXIMUM_SEMAPHORES,
+    _CONFIGURE_SCHEDULER_COUNT
+  );
+#endif
+
+#if CONFIGURE_MAXIMUM_TIMERS > 0
+  TIMER_INFORMATION_DEFINE( CONFIGURE_MAXIMUM_TIMERS );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIGURE_INIT */
+
+#endif /* _RTEMS_CONFDEFS_OBJECTSCLASSIC_H */



More information about the vc mailing list