diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-26 06:34:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-05 13:41:06 +0200 |
| commit | 8776bb94197613a369b47b3adf4b2d4e0ba766ed (patch) | |
| tree | 37f2177f56e8d758bc4433ea8f8d98851fa81a18 /cpukit/score/cpu/arm | |
| parent | dev/sc16is752: Deal with a baud of zero (diff) | |
| download | rtems-8776bb94197613a369b47b3adf4b2d4e0ba766ed.tar.bz2 | |
score: Remove CPU_PROVIDES_IDLE_THREAD_BODY
Remove the CPU_PROVIDES_IDLE_THREAD_BODY option to avoid unnecessary
conditional compilation.
Close #3539.
Diffstat (limited to 'cpukit/score/cpu/arm')
| -rw-r--r-- | cpukit/score/cpu/arm/armv7-thread-idle.c | 6 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/include/rtems/score/cpu.h | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/cpukit/score/cpu/arm/armv7-thread-idle.c b/cpukit/score/cpu/arm/armv7-thread-idle.c index 527fbbcc88..dd78a938ef 100644 --- a/cpukit/score/cpu/arm/armv7-thread-idle.c +++ b/cpukit/score/cpu/arm/armv7-thread-idle.c @@ -8,7 +8,7 @@ * Copyright (c) 2012 embedded brains GmbH. All rights reserved. * * embedded brains GmbH - * Obere Lagerstr. 30 + * Dornierstr. 4 * 82178 Puchheim * Germany * <rtems@embedded-brains.de> @@ -24,13 +24,13 @@ #include <rtems/score/cpu.h> -#ifdef ARM_MULTILIB_HAS_WFI void *_CPU_Thread_Idle_body( uintptr_t ignored ) { while ( true ) { +#ifdef ARM_MULTILIB_HAS_WFI __asm__ volatile ("wfi"); +#endif /* ARM_MULTILIB_HAS_WFI */ } } -#endif /* ARM_MULTILIB_HAS_WFI */ diff --git a/cpukit/score/cpu/arm/include/rtems/score/cpu.h b/cpukit/score/cpu/arm/include/rtems/score/cpu.h index 3343b40297..a44abe167e 100644 --- a/cpukit/score/cpu/arm/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/arm/include/rtems/score/cpu.h @@ -119,12 +119,6 @@ #define CPU_ENABLE_ROBUST_THREAD_DISPATCH TRUE -#if defined(ARM_MULTILIB_HAS_WFI) - #define CPU_PROVIDES_IDLE_THREAD_BODY TRUE -#else - #define CPU_PROVIDES_IDLE_THREAD_BODY FALSE -#endif - #define CPU_STACK_GROWS_UP FALSE #if defined(ARM_MULTILIB_CACHE_LINE_MAX_64) @@ -597,9 +591,7 @@ static inline CPU_Counter_ticks _CPU_Counter_difference( return second - first; } -#if CPU_PROVIDES_IDLE_THREAD_BODY == TRUE - void *_CPU_Thread_Idle_body( uintptr_t ignored ); -#endif +void *_CPU_Thread_Idle_body( uintptr_t ignored ); /** @} */ |