rtems: Create modes implementation header

Move implementation specific parts of modes.h and modes.inl into new
header file modesimpl.h.  The modes.h contains now only the application
visible API.

2 files changed, 153 insertions, 11 deletions

diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/cpukit/rtems/include/rtems/rtems/modes.h
index 9a4bf73f91..7b07c8892f 100644
--- a/cpukit/rtems/include/rtems/rtems/modes.h
+++ b/cpukit/rtems/include/rtems/rtems/modes.h
@@ -21,6 +21,12 @@
 #ifndef _RTEMS_RTEMS_MODES_H
 #define _RTEMS_RTEMS_MODES_H
 
+#include <rtems/score/cpu.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup ClassicModes Modes
  *
@@ -30,12 +36,6 @@
  */
 /**@{*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-
 /**
  *  The following type defines the control block used to manage
  *  each a mode set.
@@ -121,15 +121,11 @@ Modes_Control rtems_interrupt_level_body(
   uint32_t   level
 );
 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/modes.inl>
-#endif
+/**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/modesimpl.h b/cpukit/rtems/include/rtems/rtems/modesimpl.h
new file mode 100644
index 0000000000..7aa6bcb3f0
--- /dev/null
+++ b/cpukit/rtems/include/rtems/rtems/modesimpl.h
@@ -0,0 +1,146 @@
+/**
+ * @file
+ *
+ * @ingroup ClassicModesImpl
+ *
+ * @brief Classic Modes Implementation
+ */
+
+/*  COPYRIGHT (c) 1989-2008.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef _RTEMS_RTEMS_MODESIMPL_H
+#define _RTEMS_RTEMS_MODESIMPL_H
+
+#include <rtems/rtems/modes.h>
+#include <rtems/score/isrlevel.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup ClassicModesImpl Classic Modes Implementation
+ *
+ * @ingroup ClassicModes
+ *
+ * @{
+ */
+
+/**
+ *  @brief Checks if any of the mode flags in mask are set in mode_set.
+ *
+ *  This function returns TRUE if any of the mode flags in mask
+ *  are set in mode_set, and FALSE otherwise.
+ */
+RTEMS_INLINE_ROUTINE bool _Modes_Mask_changed (
+  Modes_Control mode_set,
+  Modes_Control masks
+)
+{
+   return ( mode_set & masks ) ? true : false;
+}
+
+/**
+ *  @brief Checks if mode_set says that Asynchronous Signal Processing is disabled.
+ *
+ *  This function returns TRUE if mode_set indicates that Asynchronous
+ *  Signal Processing is disabled, and FALSE otherwise.
+ */
+RTEMS_INLINE_ROUTINE bool _Modes_Is_asr_disabled (
+  Modes_Control mode_set
+)
+{
+   return (mode_set & RTEMS_ASR_MASK) == RTEMS_NO_ASR;
+}
+
+/**
+ *  @brief Checks if mode_set indicates that preemption is enabled.
+ *
+ *  This function returns TRUE if mode_set indicates that preemption
+ *  is enabled, and FALSE otherwise.
+ */
+RTEMS_INLINE_ROUTINE bool _Modes_Is_preempt (
+  Modes_Control mode_set
+)
+{
+   return (mode_set & RTEMS_PREEMPT_MASK) == RTEMS_PREEMPT;
+}
+
+/**
+ *  @brief Checks if mode_set indicates that timeslicing is enabled.
+ *
+ *  This function returns TRUE if mode_set indicates that timeslicing
+ *  is enabled, and FALSE otherwise.
+ */
+RTEMS_INLINE_ROUTINE bool _Modes_Is_timeslice (
+  Modes_Control mode_set
+)
+{
+  return (mode_set & RTEMS_TIMESLICE_MASK) == RTEMS_TIMESLICE;
+}
+
+/**
+ *  @brief Gets the interrupt level portion of the mode_set.
+ *
+ *  This function returns the interrupt level portion of the mode_set.
+ */
+RTEMS_INLINE_ROUTINE ISR_Level _Modes_Get_interrupt_level (
+  Modes_Control mode_set
+)
+{
+  return ( mode_set & RTEMS_INTERRUPT_MASK );
+}
+
+/**
+ *  @brief Sets the current interrupt level to that specified in the mode_set.
+ *
+ *  This routine sets the current interrupt level to that specified
+ *  in the mode_set.
+ */
+RTEMS_INLINE_ROUTINE void _Modes_Set_interrupt_level (
+  Modes_Control mode_set
+)
+{
+  _ISR_Set_level( _Modes_Get_interrupt_level( mode_set ) );
+}
+
+/**
+ *  @brief Changes the modes in old_mode_set indicated by
+ *  mask to the requested values in new_mode_set.
+ *
+ *  This routine changes the modes in old_mode_set indicated by
+ *  mask to the requested values in new_mode_set.  The resulting
+ *  mode set is returned in out_mode_set and the modes that changed
+ *  is returned in changed.
+ */
+RTEMS_INLINE_ROUTINE void _Modes_Change (
+  Modes_Control  old_mode_set,
+  Modes_Control  new_mode_set,
+  Modes_Control  mask,
+  Modes_Control *out_mode_set,
+  Modes_Control *changed
+)
+{
+  Modes_Control _out_mode;
+
+  _out_mode      =  old_mode_set;
+  _out_mode     &= ~mask;
+  _out_mode     |= new_mode_set & mask;
+  *changed       = _out_mode ^ old_mode_set;
+  *out_mode_set  = _out_mode;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif
+/* end of include file */