projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch "preempt" in "trunk".
[bertos.git]
/
bertos
/
cfg
/
cfg_proc.h
diff --git
a/bertos/cfg/cfg_proc.h
b/bertos/cfg/cfg_proc.h
index 52e245265e745907bd2ae113c9aef253edaf18a2..1cd5a191a10de59d5c7f4aad1019d9d0b15c453a 100644
(file)
--- a/
bertos/cfg/cfg_proc.h
+++ b/
bertos/cfg/cfg_proc.h
@@
-62,10
+62,10
@@
#define CONFIG_KERN_HEAP 0
/**
#define CONFIG_KERN_HEAP 0
/**
- * Preemptive process scheduling.
WARNING: Experimental, still incomplete!
+ * Preemptive process scheduling.
*
* $WIZ$ type = "boolean"
*
* $WIZ$ type = "boolean"
- * $WIZ$
supports = "Fals
e"
+ * $WIZ$
conditional_deps = "timer", "idl
e"
*/
#define CONFIG_KERN_PREEMPT 0
*/
#define CONFIG_KERN_PREEMPT 0
@@
-80,6
+80,7
@@
*
* $WIZ$ type = "int"
* $WIZ$ min = 1
*
* $WIZ$ type = "int"
* $WIZ$ min = 1
+ * $WIZ$ supports = "False"
*/
#define CONFIG_KERN_QUANTUM 47
*/
#define CONFIG_KERN_QUANTUM 47