Changeset 2859e422 in rtems

Timestamp:

03/13/23 12:33:13 (7 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

377eae4

Parents:

9bfe5f5

git-author:

Sebastian Huber <sebastian.huber@…> (03/13/23 12:33:13)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/14/23 07:00:11)

Message:

Provide kernel space items only if needed

The kernel space parts of standard system header files were protected
against misuse by a preprocessor error directive. This approach does
not work well with tools such as Doxygen. Provide the kernel space
items only if the required defines are present.

Location:

cpukit/include/machine

Files:

• _kernel_in.h (modified) (2 diffs)
• _kernel_in6.h (modified) (2 diffs)
• _kernel_param.h (modified) (2 diffs)
• _kernel_time.h (modified) (2 diffs)
• _kernel_types.h (modified) (2 diffs)
• _kernel_uio.h (modified) (2 diffs)

cpukit/include/machine/_kernel_in.h

@@ -40 +40 @@
  */
 
-#if !defined(_NETINET_IN_H_) || !defined(_KERNEL)
-#error "must be included via <netinet/in.h> in kernel space"
-#endif
+#if defined(_NETINET_IN_H_) && defined(_KERNEL)
 
 struct ifnet; struct mbuf;      /* forward declarations for Standard C */
@@ -72 +70 @@
 #define sintosa(sin)    ((struct sockaddr *)(sin))
 #define ifatoia(ifa)    ((struct in_ifaddr *)(ifa))
+
+#else /* !_NETINET_IN_H_ || !_KERNEL */
+#error "must be included via <netinet/in.h> in kernel space"
+#endif /* _NETINET_IN_H_ && _KERNEL */

cpukit/include/machine/_kernel_in6.h

@@ -39 +39 @@
  */
 
-#if !defined(_NETINET6_IN6_H_) || !defined(_KERNEL)
-#error "must be included via <netinet6/in6.h> in kernel space"
-#endif
+#if defined(_NETINET6_IN6_H_) && defined(_KERNEL)
 
 /* XXX nonstandard */
@@ -188 +186 @@
 #define sin6tosa(sin6)  ((struct sockaddr *)(sin6))
 #define ifatoia6(ifa)   ((struct in6_ifaddr *)(ifa))
+
+#else /* !_NETINET6_IN6_H_ || !_KERNEL */
+#error "must be included via <netinet6/in6.h> in kernel space"
+#endif /* _NETINET6_IN6_H_ && _KERNEL */

cpukit/include/machine/_kernel_param.h

@@ -38 +38 @@
 #include <sys/priority.h>
 
-#if !defined(_SYS_PARAM_H_) || !defined(_KERNEL)
-#error "must be included via <sys/param.h> in kernel space"
-#endif
+#if defined(_SYS_PARAM_H_) && defined(_KERNEL)
 
 #ifndef FALSE
@@ -66 +64 @@
 #define ntohs(x)        __ntohs(x)
 #endif /* !_BYTEORDER_FUNC_DEFINED */
+
+#else /* !_SYS_PARAM_H_ || !_KERNEL */
+#error "must be included via <sys/param.h> in kernel space"
+#endif /* _SYS_PARAM_H_ && _KERNEL */

cpukit/include/machine/_kernel_time.h

@@ -42 +42 @@
  */
 
-#if !defined(_SYS_TIME_H_) || !defined(_KERNEL)
-#error "must be included via <sys/time.h> in kernel space"
-#endif
+#if defined(_SYS_TIME_H_) && defined(_KERNEL)
 
 #include <machine/_timecounter.h>
@@ -217 +215 @@
         (((sbt2) >= sbt_timethreshold) ?                                \
             ((*(sbt) = getsbinuptime()), 1) : ((*(sbt) = sbinuptime()), 0))
+
+#else /* !_SYS_TIME_H_ || !_KERNEL */
+#error "must be included via <sys/time.h> in kernel space"
+#endif /* _SYS_TIME_H_ && _KERNEL */

cpukit/include/machine/_kernel_types.h

@@ -33 +33 @@
  */
 
-#if !defined(_SYS_TYPES_H) || !defined(_KERNEL)
-#error "must be included via <sys/types.h> in kernel space"
-#endif
+#if defined(_SYS_TYPES_H) && defined(_KERNEL)
 
 #include <stdbool.h>
@@ -43 +41 @@
 typedef char            vm_memattr_t;
 typedef struct vm_page  *vm_page_t;
+
+#else /* !_SYS_TYPES_H || !_KERNEL */
+#error "must be included via <sys/types.h> in kernel space"
+#endif /* _SYS_TYPES_H && _KERNEL */

cpukit/include/machine/_kernel_uio.h

@@ -40 +40 @@
  */
 
-#if !defined(_SYS_UIO_H_) || !defined(_KERNEL)
-#error "must be included via <sys/uio.h> in kernel space"
-#endif
+#if defined(_SYS_UIO_H_) && defined(_KERNEL)
 
 struct uio {
@@ -89 +87 @@
 int     uiomove_nofault(void *cp, int n, struct uio *uio);
 int     uiomove_object(struct vm_object *obj, off_t obj_size, struct uio *uio);
+
+#else /* !_SYS_UIO_H_ || !_KERNEL */
+#error "must be included via <sys/uio.h> in kernel space"
+#endif /* _SYS_UIO_H_ && _KERNEL */