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 7b7785e19fb15042900cbdd50814127d8a11c340..1cd5a191a10de59d5c7f4aad1019d9d0b15c453a 100644 (file)
--- a/bertos/cfg/cfg_proc.h
+++ b/bertos/cfg/cfg_proc.h
@@ -47,14 +47,9 @@
 #define CONFIG_KERN 0
 
 /**
- * Left for backwards compatibility, do not use.
- * Will be deprecated.
- */
-#define CONFIG_KERN_SCHED CONFIG_KERN
-
-/**
- * Kernel interrupt supervisor.
+ * Kernel interrupt supervisor. WARNING: Experimental, still incomplete!
  * $WIZ$ type = "boolean"
+ * $WIZ$ supports = "False"
  */
 #define CONFIG_KERN_IRQ 0
 
@@ -62,13 +57,15 @@
  * Dynamic memory allocation for processes.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ supports = "False"
  */
 #define CONFIG_KERN_HEAP 0
 
 /**
- * Preemptive process scheduling. WARNING: Experimental, do not use!
+ * Preemptive process scheduling.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ conditional_deps = "timer", "idle"
  */
 #define CONFIG_KERN_PREEMPT 0
 
@@ -82,7 +79,8 @@
  * Time sharing quantum (a prime number prevents interference effects) [ms].
  *
  * $WIZ$ type = "int"
- * $WIZ$ min = "0"
+ * $WIZ$ min = 1
+ * $WIZ$ supports = "False"
  */
 #define CONFIG_KERN_QUANTUM 47
 
@@ -95,10 +93,10 @@
 #define KERN_LOG_LEVEL LOG_LVL_ERR
 
 /**
- * Module logging level.
+ * Module logging format.
  *
  * $WIZ$ type = "enum"
- * $WIZ$ value_list = "log_level"
+ * $WIZ$ value_list = "log_format"
  */
 #define KERN_LOG_FORMAT LOG_FMT_VERBOSE