RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Remove ISR_LOCK_MEMBER

Browse Source 
Use ISR_LOCK_NEEDS_OBJECT to determine if a lock object is needed.

Update #4957 and #5038.
This commit is contained in:
Sebastian Huber
2024-06-18 11:56:09 +02:00
parent 283b4406c0
commit b0599ef35d
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/include/rtems/rtems/timerimpl.h
View File

@@ -60,7 +60,9 @@ extern "C" {
*/ */
typedef struct Timer_server_Control { typedef struct Timer_server_Control {
ISR_LOCK_MEMBER( Lock ) #if ISR_LOCK_NEEDS_OBJECT
ISR_lock_Control Lock;
#endif
Chain_Control Pending; Chain_Control Pending;

4
cpukit/include/rtems/score/chainimpl.h
View File

@@ -1012,7 +1012,9 @@ static inline void _Chain_Iterator_registry_update(
* typedef struct { * typedef struct {
* Chain_Control Chain; * Chain_Control Chain;
* Chain_Iterator_registry Iterators; * Chain_Iterator_registry Iterators;
* ISR_LOCK_MEMBER( Lock ) * #if ISR_LOCK_NEEDS_OBJECT
* ISR_lock_Control Lock;
* #endif
* } Some_Control; * } Some_Control;
* *
* void iterate( * void iterate(

13
cpukit/include/rtems/score/isrlock.h
View File

@@ -110,19 +110,6 @@ typedef struct {
#endif #endif
} ISR_lock_Context; } ISR_lock_Context;
/**
* @brief Defines an ISR lock member.
*
* Do not add a ';' after this macro.
*
* @param _designator The designator for the interrupt lock.
*/
#if defined( RTEMS_SMP )
#define ISR_LOCK_MEMBER( _designator ) ISR_lock_Control _designator;
#else
#define ISR_LOCK_MEMBER( _designator )
#endif
/** /**
* @brief Initializer for static initialization of ISR locks. * @brief Initializer for static initialization of ISR locks.
* *

4
cpukit/include/rtems/score/thread.h
View File

@@ -542,7 +542,9 @@ typedef struct {
* @brief Information required to manage a thread timer. * @brief Information required to manage a thread timer.
*/ */
typedef struct { typedef struct {
ISR_LOCK_MEMBER( Lock ) #if ISR_LOCK_NEEDS_OBJECT
ISR_lock_Control Lock;
#endif
Watchdog_Header *header; Watchdog_Header *header;
Watchdog_Control Watchdog; Watchdog_Control Watchdog;
} Thread_Timer_information; } Thread_Timer_information;