summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2020-06-24 10:36:16 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-09-18 18:55:09 +0200
commit5353ea89d7da223b82460bb67116dbfa0bdad7c4 (patch)
treec5b12ac21852354d806484f534a7e6e34200826f
parent96ea30f0c984e5df6cf9ed52d85d38cdd676f499 (diff)
downloadrtems-5353ea89d7da223b82460bb67116dbfa0bdad7c4.tar.bz2
rtems: Move from <rtems.h> to <rtems/config.h>
Move configuration related declarations and definitions to <rtems/config.h>. The goal is to make <rtems.h> an include only header file.
-rw-r--r--cpukit/include/rtems.h16
-rw-r--r--cpukit/include/rtems/config.h17
-rw-r--r--cpukit/sapi/src/getcopyrightnotice.c2
-rw-r--r--cpukit/sapi/src/getversionstring.c2
4 files changed, 19 insertions, 18 deletions
diff --git a/cpukit/include/rtems.h b/cpukit/include/rtems.h
index 4392f08ce8..6bdca97769 100644
--- a/cpukit/include/rtems.h
+++ b/cpukit/include/rtems.h
@@ -62,22 +62,6 @@
extern "C" {
#endif
-/**
- * @brief Returns the pointer to the RTEMS copyright notice.
- */
-const char *rtems_get_copyright_notice(void);
-
-/**
- * @brief Returns the pointer to the RTEMS version string.
- */
-const char *rtems_get_version_string(void);
-
-/**
- * @brief Indicates whether this processor variant has hardware floating point
- * support.
- */
-#define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP
-
/**********************************************************************
* CONSTANTS WHICH MAY BE USED IN OBJECT NAME TO ID SEARCHES
**********************************************************************/
diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h
index e82c7abf11..1fbcf22f2e 100644
--- a/cpukit/include/rtems/config.h
+++ b/cpukit/include/rtems/config.h
@@ -27,6 +27,7 @@
* the configuration table.
*/
+#include <rtems/score/cpu.h>
#include <rtems/score/object.h>
#include <rtems/score/isr.h>
#include <rtems/score/memory.h>
@@ -164,6 +165,22 @@ uint32_t rtems_configuration_get_maximum_extensions( void );
#define rtems_configuration_get_maximum_processors() \
(_SMP_Processor_configured_maximum)
+/**
+ * @brief Returns the pointer to the RTEMS copyright notice.
+ */
+const char *rtems_get_copyright_notice(void);
+
+/**
+ * @brief Returns the pointer to the RTEMS version string.
+ */
+const char *rtems_get_version_string(void);
+
+/**
+ * @brief Indicates whether this processor variant has hardware floating point
+ * support.
+ */
+#define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP
+
#ifdef __cplusplus
}
#endif
diff --git a/cpukit/sapi/src/getcopyrightnotice.c b/cpukit/sapi/src/getcopyrightnotice.c
index 4e5df66524..cd601254e6 100644
--- a/cpukit/sapi/src/getcopyrightnotice.c
+++ b/cpukit/sapi/src/getcopyrightnotice.c
@@ -39,7 +39,7 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#include <rtems.h>
+#include <rtems/config.h>
#include <rtems/score/copyrt.h>
const char *rtems_get_copyright_notice( void )
diff --git a/cpukit/sapi/src/getversionstring.c b/cpukit/sapi/src/getversionstring.c
index a036fe2fbf..f8380f7b4f 100644
--- a/cpukit/sapi/src/getversionstring.c
+++ b/cpukit/sapi/src/getversionstring.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <rtems.h>
+#include <rtems/config.h>
#include <rtems/score/copyrt.h>
const char *rtems_get_version_string(void)