projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SEC: Add AES implementation.
[bertos.git]
/
bertos
/
cpu
/
power.h
diff --git
a/bertos/cpu/power.h
b/bertos/cpu/power.h
index 035495d47811aa1016bf2f41d56dd36046b04813..f161c698f40ebf14f261d4b77323138e45f98cfb 100644
(file)
--- a/
bertos/cpu/power.h
+++ b/
bertos/cpu/power.h
@@
-37,10
+37,12
@@
#ifndef CPU_POWER_H
#define CPU_POWER_H
#ifndef CPU_POWER_H
#define CPU_POWER_H
-#include
<cfg/cfg_kern.h>
-#include
<cfg/cfg_wdt.h>
+#include
"cfg/cfg_proc.h"
+#include
"cfg/cfg_wdt.h"
-#if CONFIG_KERNEL
+#include <cfg/compiler.h>
+
+#if CONFIG_KERN
#include <kern/proc.h>
#endif
#include <kern/proc.h>
#endif
@@
-66,8
+68,10
@@
*/
INLINE void cpu_relax(void)
{
*/
INLINE void cpu_relax(void)
{
-#if CONFIG_KERNEL
- proc_yield();
+ MEMORY_BARRIER;
+#if CONFIG_KERN
+ if (proc_preemptAllowed())
+ proc_yield();
#endif
#if CONFIG_WATCHDOG
#endif
#if CONFIG_WATCHDOG