From 4288f9fd01f57ff7711bb3d1c4fe22f6ff463980 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 27 Aug 2013 15:10:50 +0200 Subject: score: Use static inline directly This file uses already C11 features. Include proper header file. --- cpukit/score/include/rtems/score/atomic.h | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'cpukit/score/include/rtems/score/atomic.h') diff --git a/cpukit/score/include/rtems/score/atomic.h b/cpukit/score/include/rtems/score/atomic.h index d51e7331ab..2c431cc2c8 100644 --- a/cpukit/score/include/rtems/score/atomic.h +++ b/cpukit/score/include/rtems/score/atomic.h @@ -44,7 +44,7 @@ extern "C" { * @param object an atomic type pointer of object. * @param value a value to be stored into object. */ -RTEMS_INLINE_ROUTINE void _Atomic_Init_uint( +static inline void _Atomic_Init_uint( volatile Atomic_Uint *object, uint_fast32_t value ) @@ -52,7 +52,7 @@ RTEMS_INLINE_ROUTINE void _Atomic_Init_uint( _CPU_atomic_Init_uint(object, value); } -RTEMS_INLINE_ROUTINE void _Atomic_Init_ptr( +static inline void _Atomic_Init_ptr( volatile Atomic_Pointer *object, uintptr_t value ) @@ -60,7 +60,7 @@ RTEMS_INLINE_ROUTINE void _Atomic_Init_ptr( _CPU_atomic_Init_ptr(object, value); } -RTEMS_INLINE_ROUTINE void _Atomic_Init_flag( +static inline void _Atomic_Init_flag( volatile Atomic_Flag *object, _Bool value ) @@ -76,7 +76,7 @@ RTEMS_INLINE_ROUTINE void _Atomic_Init_flag( * * The order shall not be ATOMIC_ORDER_RELEASE. */ -RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Load_uint( +static inline uint_fast32_t _Atomic_Load_uint( volatile Atomic_Uint *object, Atomic_Order order ) @@ -84,7 +84,7 @@ RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Load_uint( return _CPU_atomic_Load_uint( object, order ); } -RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Load_ptr( +static inline uintptr_t _Atomic_Load_ptr( volatile Atomic_Pointer *object, Atomic_Order order ) @@ -101,7 +101,7 @@ RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Load_ptr( * * The order shall not be ATOMIC_ORDER_ACQUIRE. */ -RTEMS_INLINE_ROUTINE void _Atomic_Store_uint( +static inline void _Atomic_Store_uint( volatile Atomic_Uint *object, uint_fast32_t value, Atomic_Order order @@ -110,7 +110,7 @@ RTEMS_INLINE_ROUTINE void _Atomic_Store_uint( _CPU_atomic_Store_uint( object, value, order ); } -RTEMS_INLINE_ROUTINE void _Atomic_Store_ptr( +static inline void _Atomic_Store_ptr( volatile Atomic_Pointer *object, uintptr_t value, Atomic_Order order @@ -128,7 +128,7 @@ RTEMS_INLINE_ROUTINE void _Atomic_Store_ptr( * * @retval a result value before add ops. */ -RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_add_uint( +static inline uint_fast32_t _Atomic_Fetch_add_uint( volatile Atomic_Uint *object, uint_fast32_t value, Atomic_Order order @@ -137,7 +137,7 @@ RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_add_uint( return _CPU_atomic_Fetch_add_uint( object, value, order ); } -RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_add_ptr( +static inline uintptr_t _Atomic_Fetch_add_ptr( volatile Atomic_Pointer *object, uintptr_t value, Atomic_Order order @@ -155,7 +155,7 @@ RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_add_ptr( * * @retval a result value before sub ops. */ -RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_sub_uint( +static inline uint_fast32_t _Atomic_Fetch_sub_uint( volatile Atomic_Uint *object, uint_fast32_t value, Atomic_Order order @@ -164,7 +164,7 @@ RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_sub_uint( return _CPU_atomic_Fetch_sub_uint( object, value, order ); } -RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_sub_ptr( +static inline uintptr_t _Atomic_Fetch_sub_ptr( volatile Atomic_Pointer *object, uintptr_t value, Atomic_Order order @@ -182,7 +182,7 @@ RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_sub_ptr( * * @retval a result value before or ops. */ -RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_or_uint( +static inline uint_fast32_t _Atomic_Fetch_or_uint( volatile Atomic_Uint *object, uint_fast32_t value, Atomic_Order order @@ -191,7 +191,7 @@ RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_or_uint( return _CPU_atomic_Fetch_or_uint( object, value, order ); } -RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_or_ptr( +static inline uintptr_t _Atomic_Fetch_or_ptr( volatile Atomic_Pointer *object, uintptr_t value, Atomic_Order order @@ -209,7 +209,7 @@ RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_or_ptr( * * @retval a result value before and ops. */ -RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_and_uint( +static inline uint_fast32_t _Atomic_Fetch_and_uint( volatile Atomic_Uint *object, uint_fast32_t value, Atomic_Order order @@ -218,7 +218,7 @@ RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Fetch_and_uint( return _CPU_atomic_Fetch_and_uint( object, value, order ); } -RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_and_ptr( +static inline uintptr_t _Atomic_Fetch_and_ptr( volatile Atomic_Pointer *object, uintptr_t value, Atomic_Order order @@ -236,7 +236,7 @@ RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Fetch_and_ptr( * * @retval a result value before exchange ops. */ -RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Exchange_uint( +static inline uint_fast32_t _Atomic_Exchange_uint( volatile Atomic_Uint *object, uint_fast32_t value, Atomic_Order order @@ -245,7 +245,7 @@ RTEMS_INLINE_ROUTINE uint_fast32_t _Atomic_Exchange_uint( return _CPU_atomic_Exchange_uint( object, value, order ); } -RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Exchange_ptr( +static inline uintptr_t _Atomic_Exchange_ptr( volatile Atomic_Pointer *object, uintptr_t value, Atomic_Order order @@ -268,7 +268,7 @@ RTEMS_INLINE_ROUTINE uintptr_t _Atomic_Exchange_ptr( * @retval true if the compare exchange successully. * @retval false if the compare exchange failed. */ -RTEMS_INLINE_ROUTINE bool _Atomic_Compare_exchange_uint( +static inline bool _Atomic_Compare_exchange_uint( volatile Atomic_Uint *object, uint_fast32_t *old_value, uint_fast32_t new_value, @@ -280,7 +280,7 @@ RTEMS_INLINE_ROUTINE bool _Atomic_Compare_exchange_uint( order_succ, order_fail ); } -RTEMS_INLINE_ROUTINE bool _Atomic_Compare_exchange_ptr( +static inline bool _Atomic_Compare_exchange_ptr( volatile Atomic_Pointer *object, uintptr_t *old_value, uintptr_t new_value, @@ -299,7 +299,7 @@ RTEMS_INLINE_ROUTINE bool _Atomic_Compare_exchange_ptr( * @param order a type of Atomic_Order. * */ -RTEMS_INLINE_ROUTINE void _Atomic_Clear_flag( +static inline void _Atomic_Clear_flag( volatile Atomic_Flag *object, Atomic_Order order ) @@ -316,7 +316,7 @@ RTEMS_INLINE_ROUTINE void _Atomic_Clear_flag( * @retval true if the test and set successully. * @retval false if the test and set failed. */ -RTEMS_INLINE_ROUTINE bool _Atomic_Test_set_flag( +static inline bool _Atomic_Test_set_flag( volatile Atomic_Flag *object, Atomic_Order order ) -- cgit v1.2.3