summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-03-15 10:16:24 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-03-15 10:24:40 +0100
commit6db5e650fb80824c4e9339dfe73976662245d449 (patch)
tree6a945183fb7c14729579697d279729aca266561a
parentbsps/sparc: Fix linker section (diff)
downloadrtems-6db5e650fb80824c4e9339dfe73976662245d449.tar.bz2
score: Add _Objects_ISR_disable_and_acquire()
-rw-r--r--cpukit/score/include/rtems/score/objectimpl.h29
1 files changed, 22 insertions, 7 deletions
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h
index c681c9a9a5..d24f5847b8 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/cpukit/score/include/rtems/score/objectimpl.h
@@ -593,10 +593,10 @@ Objects_Control *_Objects_Get_no_protection(
/**
* @brief Acquires an object by its identifier.
*
- * This function is similar to _Objects_Get_isr_disable(). It acquires the
- * object specific ISR lock for local objects. Thread dispatching is not
- * disabled for local objects. For remote objects thread dispatching is
- * disabled.
+ * This function is similar to _Objects_Get_isr_disable(). It disables
+ * interrupts and acquires the object specific ISR lock for local objects.
+ * Thread dispatching is not disabled for local objects. For remote objects
+ * thread dispatching is disabled.
*
* @param[in] information The object information.
* @param[in] id The object identifier.
@@ -604,10 +604,11 @@ Objects_Control *_Objects_Get_no_protection(
* @param[in] lock_context The lock context for local objects.
*
* @retval object The object corresponding to the identifier.
- * @retval NULL No object exists in this domain for this identifer.
+ * @retval NULL No object exists in this domain for this identifier.
*
- * @see _Objects_Release(), _Objects_Release_and_ISR_enable(), and
- * _Objects_Release_and_thread_dispatch_disable().
+ * @see _Objects_ISR_disable_and_acquire(), _Objects_Release(),
+ * _Objects_Release_and_ISR_enable(), and
+ * _Objects_Release_and_thread_dispatch_disable().
*/
Objects_Control *_Objects_Acquire(
const Objects_Information *information,
@@ -617,6 +618,20 @@ Objects_Control *_Objects_Acquire(
);
/**
+ * @brief Acquires a local object and disables interrupts.
+ *
+ * @param[in] the_object The local object to acquire.
+ * @param[in] lock_context The lock context.
+ */
+RTEMS_INLINE_ROUTINE void _Objects_ISR_disable_and_acquire(
+ Objects_Control *the_object,
+ ISR_lock_Context *lock_context
+)
+{
+ _ISR_lock_ISR_disable_and_acquire( &the_object->Lock, lock_context );
+}
+
+/**
* @brief Releases a local object.
*
* @param[in] the_object The local object acquired by _Objects_Acquire().