From fb17dfb1ad2960d441b02f4e0ab8d3e9acb54be4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 14 Oct 2020 10:47:44 +0200 Subject: Avoid ISR_LOCK_MEMBER() since it confuses Doxygen If RTEMS_SMP is not defined, then Doxygen adds the comments intended for conditional the lock member to the next member. --- cpukit/include/rtems/rtems/partdata.h | 4 +++- cpukit/include/rtems/rtems/ratemondata.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'cpukit/include/rtems/rtems') diff --git a/cpukit/include/rtems/rtems/partdata.h b/cpukit/include/rtems/rtems/partdata.h index 196c2142ae..a6bcee229a 100644 --- a/cpukit/include/rtems/rtems/partdata.h +++ b/cpukit/include/rtems/rtems/partdata.h @@ -41,11 +41,13 @@ typedef struct { */ Objects_Control Object; +#if defined(RTEMS_SMP) /** * @brief This lock protects the chain of unallocated buffers and the number * of allocated buffers. */ - ISR_LOCK_MEMBER( Lock ) + ISR_lock_Control Lock; +#endif /** * @brief This member contains the base address of the buffer area. diff --git a/cpukit/include/rtems/rtems/ratemondata.h b/cpukit/include/rtems/rtems/ratemondata.h index f35fa7eb61..700285c7b4 100644 --- a/cpukit/include/rtems/rtems/ratemondata.h +++ b/cpukit/include/rtems/rtems/ratemondata.h @@ -71,10 +71,12 @@ typedef struct { /** This field is the object management portion of a Period instance. */ Objects_Control Object; +#if defined(RTEMS_SMP) /** * @brief Protects the rate monotonic period state. */ - ISR_LOCK_MEMBER( Lock ) + ISR_lock_Control Lock; +#endif /** This is the timer used to provide the unblocking mechanism. */ Watchdog_Control Timer; -- cgit v1.2.3