[rtems commit] rtems: Remove _Modes_Set_interrupt_level()

Sebastian Huber sebh at rtems.org
Sat Feb 20 14:25:22 UTC 2021


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Feb 19 09:48:14 2021 +0100

rtems: Remove _Modes_Set_interrupt_level()

This call just obfuscated the call to _ISR_Set_level().

Update #4244.

---

 cpukit/include/rtems/rtems/modesimpl.h | 14 --------------
 cpukit/rtems/src/taskmode.c            |  8 +++-----
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/cpukit/include/rtems/rtems/modesimpl.h b/cpukit/include/rtems/rtems/modesimpl.h
index 5677c7f..2b5e00f 100644
--- a/cpukit/include/rtems/rtems/modesimpl.h
+++ b/cpukit/include/rtems/rtems/modesimpl.h
@@ -19,7 +19,6 @@
 #define _RTEMS_RTEMS_MODESIMPL_H
 
 #include <rtems/rtems/modes.h>
-#include <rtems/score/isrlevel.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,19 +85,6 @@ RTEMS_INLINE_ROUTINE ISR_Level _Modes_Get_interrupt_level (
   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 (
-  rtems_mode mode_set
-)
-{
-  _ISR_Set_level( _Modes_Get_interrupt_level( mode_set ) );
-}
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c
index 2490536..e1748bc 100644
--- a/cpukit/rtems/src/taskmode.c
+++ b/cpukit/rtems/src/taskmode.c
@@ -23,6 +23,7 @@
 #include <rtems/rtems/tasksdata.h>
 #include <rtems/rtems/modesimpl.h>
 #include <rtems/rtems/signalimpl.h>
+#include <rtems/score/isrlevel.h>
 #include <rtems/score/schedulerimpl.h>
 #include <rtems/score/smpimpl.h>
 #include <rtems/score/threadimpl.h>
@@ -112,11 +113,8 @@ rtems_status_code rtems_task_mode(
       executing->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
   }
 
-  /*
-   *  Set the new interrupt level
-   */
-  if ( mask & RTEMS_INTERRUPT_MASK ) {
-    _Modes_Set_interrupt_level( mode_set );
+  if ( ( mask & RTEMS_INTERRUPT_MASK ) != 0 ) {
+    _ISR_Set_level( _Modes_Get_interrupt_level( mode_set ) );
   }
 
   /*



More information about the vc mailing list