Changeset c5b7942 in rtems

Timestamp:

08/19/22 05:22:17 (16 months ago)

Author:

Chris Johns <chrisj@…>

Branches:

5

Children:

cab00c70

Parents:

b9de5b3b

git-author:

Chris Johns <chrisj@…> (08/19/22 05:22:17)

git-committer:

Chris Johns <chrisj@…> (08/27/22 00:36:27)

Message:

cpukit/include: Fix including in C++

Closes #4709

Location:

cpukit/include

Files:

• link_elf.h (modified) (2 diffs)
• linux/rbtree.h (modified) (3 diffs)
• rtems/capture.h (modified) (2 diffs)
• rtems/posix/muteximpl.h (modified) (3 diffs)
• rtems/posix/pthreadattrimpl.h (modified) (1 diff)
• rtems/rtl/rtl-obj.h (modified) (4 diffs)
• rtems/rtl/rtl.h (modified) (1 diff)
• rtems/score/priority.h (modified) (1 diff)
• rtems/score/priorityimpl.h (modified) (1 diff)
• rtems/score/scheduleredfimpl.h (modified) (2 diffs)
• rtems/score/tls.h (modified) (1 diff)
• rtems/score/watchdogimpl.h (modified) (1 diff)

cpukit/include/link_elf.h

@@ -13 +13 @@
 #include <stdint.h>
 #include <rtems/rtl/rtl-obj-fwd.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 enum sections
@@ -77 +81 @@
  */
 void _rtld_linkmap_delete (rtems_rtl_obj* obj);
+
+#ifdef __cplusplus
+}
+#endif
 #endif  /* _LINK_ELF_H_ */

cpukit/include/linux/rbtree.h

@@ -17 +17 @@
 
 #include <rtems/score/rbtree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define rb_node RBTree_Node
@@ -97 +101 @@
 static inline void rb_replace_node(
   struct rb_node *victim,
-  struct rb_node *replacement, 
+  struct rb_node *replacement,
   struct rb_root *root
 )
@@ -139 +143 @@
   )
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LINUX_RBTREE_H */

cpukit/include/rtems/capture.h

@@ -839 +839 @@
 rtems_capture_task_control (rtems_tcb* tcb)
 {
-  return tcb->Capture.control;
+  return (rtems_capture_control*) tcb->Capture.control;
 }
 
@@ -854 +854 @@
 rtems_capture_task_control_flags (rtems_tcb* tcb)
 {
-  rtems_capture_control*  control = tcb->Capture.control;
+  rtems_capture_control*  control = rtems_capture_task_control (tcb);
   if (!control)
     return 0;

cpukit/include/rtems/posix/muteximpl.h

@@ -3 +3 @@
  *
  * @brief Private Inlined Routines for POSIX Mutex's.
- * 
- * This include file contains the static inline implementation of the private 
+ *
+ * This include file contains the static inline implementation of the private
  * inlined routines for POSIX mutex's.
  */
@@ -105 +105 @@
 )
 {
-  return flags & POSIX_MUTEX_PROTOCOL_MASK;
+  return (POSIX_Mutex_Protocol) (flags & POSIX_MUTEX_PROTOCOL_MASK);
 }
 
@@ -485 +485 @@
 #endif
 /*  end of include file */
-

cpukit/include/rtems/posix/pthreadattrimpl.h

@@ -73 +73 @@
   const POSIX_API_Control *api;
 
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
+  api = (const POSIX_API_Control*) the_thread->API_Extensions[ THREAD_API_POSIX ];
   param->sched_ss_low_priority = _POSIX_Priority_From_core(
     scheduler,

cpukit/include/rtems/rtl/rtl-obj.h

@@ -232 +232 @@
   void*               tramp_brk;    /**< Trampoline memory allocator. MD
                                      *   relocators can take memory from the
-                                     *   break upto the size. */
+                                     *   break up to the size. */
   size_t              tramp_relocs; /**< Number of slots reserved for
                                      *   relocs. The remainder are for
@@ -334 +334 @@
   return
     (address >= obj->text_base) &&
-    (address < (obj->text_base + obj->text_size));
+    ((char*) address < ((char*) obj->text_base + obj->text_size));
 }
 
@@ -375 +375 @@
  * @retval bool Returns @true if the space is available.
  */
+static inline size_t rtems_rtl_obj_tramp_avail_space (const rtems_rtl_obj* obj)
+{
+  return (char*) obj->tramp_brk - (char*) obj->trampoline;
+}
+
+/**
+ * Is there space in the trampoline memory for a trapoline.
+ *
+ * @param obj The object file's descriptor to check for available space.
+ * @param size The size to be allocated.
+ * @retval bool Returns @true if the space is available.
+ */
 static inline bool rtems_rtl_obj_has_tramp_space (const rtems_rtl_obj* obj,
                                                   const size_t         size)
 {
   return (obj->trampoline != NULL &&
-          ((obj->tramp_brk - obj->trampoline) + size) <= obj->tramps_size);
+          (rtems_rtl_obj_tramp_avail_space (obj) + size) <= obj->tramps_size);
 }
 
@@ -403 +415 @@
 {
   return obj->trampoline == NULL || obj->tramp_size == 0 ?
-    0 : (obj->tramp_brk - obj->trampoline) / obj->tramp_size;
+    0 : rtems_rtl_obj_tramp_avail_space (obj) / obj->tramp_size;
 }
 

cpukit/include/rtems/rtl/rtl.h

@@ -89 +89 @@
  * variable.
  */
-extern void _rtld_debug_state (void);
+void _rtld_debug_state (void);
 
 /**

cpukit/include/rtems/score/priority.h

@@ -25 +25 @@
 #include <rtems/score/rbtree.h>
 
-struct _Scheduler_Control;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct _Scheduler_Control;
 
 /**

cpukit/include/rtems/score/priorityimpl.h

@@ -390 +390 @@
   const Priority_Node    *the_right;
 
-  the_left = left;
+  the_left = (const Priority_Control*) left;
   the_right = RTEMS_CONTAINER_OF( right, Priority_Node, Node.RBTree );
 

cpukit/include/rtems/score/scheduleredfimpl.h

@@ -101 +101 @@
   Priority_Control          prio_right;
 
-  the_left = left;
+  the_left = (const Priority_Control*) left;
   the_right = RTEMS_CONTAINER_OF( right, Scheduler_EDF_Node, Node );
 
@@ -129 +129 @@
   Priority_Control          prio_right;
 
-  the_left = left;
+  the_left = (const Priority_Control*) left;
   the_right = RTEMS_CONTAINER_OF( right, Scheduler_EDF_Node, Node );
 

cpukit/include/rtems/score/tls.h

@@ -223 +223 @@
   void *tls_block = (char *) tls_area
     + _TLS_Get_thread_control_block_area_size( (uintptr_t) _TLS_Alignment );
-  TLS_Thread_control_block *tcb = tls_area;
+  TLS_Thread_control_block *tcb = (TLS_Thread_control_block*) tls_area;
   uintptr_t aligned_size = _TLS_Heap_align_up( (uintptr_t) _TLS_Size );
   TLS_Dynamic_thread_vector *dtv = (TLS_Dynamic_thread_vector *)

cpukit/include/rtems/score/watchdogimpl.h

@@ -151 +151 @@
 )
 {
-  return RB_COLOR( &the_watchdog->Node.RBTree, Node );
+  return (Watchdog_State) RB_COLOR( &the_watchdog->Node.RBTree, Node );
 }