X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fcfg_kern.h;h=1c716c9712493c88f2c862c8e98a53d991d090e7;hb=ae263f1c0564f616b3b557498532163ffb60595f;hp=eecc5139db0a14946ff25d73e1ceb77d5ce9bb93;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git

diff --git a/bertos/cfg/cfg_kern.h b/bertos/cfg/cfg_kern.h
index eecc5139..1c716c97 100644
--- a/bertos/cfg/cfg_kern.h
+++ b/bertos/cfg/cfg_kern.h
@@ -27,15 +27,13 @@
  * the GNU General Public License.
  *
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
- *
+ * Copyright 1999,2000,2001 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
  * \brief Kernel configuration parameters
  *
  * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #ifndef CFG_KERN_H
@@ -44,82 +42,42 @@
 #include "cfg/cfg_arch.h"  /* ARCH_EMUL */
 
 /**
- * Multithreading kernel.
+ * Enable the multithreading kernel.
  */
-#define CONFIG_KERNEL 0
+#define CONFIG_KERN 0
+#define CONFIG_KERNEL CONFIG_KERN // OBSOLETE
 
 /**
- * \name Modules activation
- *
+ * \name Optional kernel features
  * \{
  */
 /*      Module/option          Active    Dependencies */
 #define CONFIG_KERN_SCHED       (0)
 #define CONFIG_KERN_SIGNALS     (0    && CONFIG_KERN_SCHED)
-#define CONFIG_KERN_TIMER       (0)
+#define CONFIG_KERN_IRQ         (0)
 #define CONFIG_KERN_HEAP        (0)
 #define CONFIG_KERN_SEMAPHORES  (0    && CONFIG_KERN_SIGNALS)
 #define CONFIG_KERN_MONITOR     (0    && CONFIG_KERN_SCHED)
+#define CONFIG_KERN_PREEMPT     (0    && CONFIG_KERN_SCHED && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ)
+#define CONFIG_KERN_PRI         (0    && CINFIG_KERN_PREEMPT)
 /*\}*/
 
-/* EXPERIMENTAL */
-#define CONFIG_KERN_PREEMPTIVE  (0    && CONFIG_KERN_SCHED && CONFIG_KERN_TIMER)
+// FIXME: move somewhere
+#define CONFIG_DEPEND(FEATURE, DEPENDENCIES)  STATIC_ASSERT(!(FEATURE) || !!(DEPS))
 
-#define CONFIG_KERN_QUANTUM     50    /**< Time sharing quantum in timer ticks. */
+CONFIG_DEPEND(CONFIG_KERN_PRI, CONFIG_KERN_PREEMPT);
 
-#if (ARCH & ARCH_EMUL)
-	/* We need a large stack because system libraries are bloated */
-	#define CONFIG_PROC_DEFSTACKSIZE  65536
-#else
-	/**
-	 * Default stack size for each thread, in bytes.
-	 *
-	 * The goal here is to allow a minimal task to save all of its
-	 * registers twice, plus push a maximum of 32 variables on the
-	 * stack.
-	 *
-	 * The actual size computed by the default formula is:
-	 *   AVR:    102
-	 *   i386:   156
-	 *   ARM:    164
-	 *   x86_64: 184
-	 *
-	 * Note that on most 16bit architectures, interrupts will also
-	 * run on the stack of the currently running process.  Nested
-	 * interrupts will greatly increases the amount of stack space
-	 * required per process.  Use irqmanager to minimize stack
-	 * usage.
-	 */
-	#define CONFIG_PROC_DEFSTACKSIZE  \
-	    (CPU_SAVED_REGS_CNT * 2 * sizeof(cpustack_t) \
-	    + 32 * sizeof(int))
-#endif
 
 /* OBSOLETE */
-#define CONFIG_KERN_DEFSTACKSIZE CONFIG_PROC_DEFSTACKSIZE
+#define CONFIG_KERN_PREEMPTIVE CONFIG_KERN_PREEMPT
+
+/// [ms] Time sharing quantum (a prime number prevents interference effects)
+#define CONFIG_KERN_QUANTUM     47
+
+/// Module logging level.
+#define KERN_LOG_LEVEL      LOG_LVL_ERR
 
-/* Memory fill codes to help debugging */
-#if CONFIG_KERN_MONITOR
-	#include <cpu/types.h>
-	#if (SIZEOF_CPUSTACK_T == 1)
-		/* 8bit cpustack_t */
-		#define CONFIG_KERN_STACKFILLCODE  0xA5
-		#define CONFIG_KERN_MEMFILLCODE    0xDB
-	#elif (SIZEOF_CPUSTACK_T == 2)
-		/* 16bit cpustack_t */
-		#define CONFIG_KERN_STACKFILLCODE  0xA5A5
-		#define CONFIG_KERN_MEMFILLCODE    0xDBDB
-	#elif (SIZEOF_CPUSTACK_T == 4)
-		/* 16bit cpustack_t */
-		#define CONFIG_KERN_STACKFILLCODE  0xA5A5A5A5UL
-		#define CONFIG_KERN_MEMFILLCODE    0xDBDBDBDBUL
-	#elif (SIZEOF_CPUSTACK_T == 8)
-		/* 16bit cpustack_t */
-		#define CONFIG_KERN_STACKFILLCODE  0xA5A5A5A5A5A5A5A5UL
-		#define CONFIG_KERN_MEMFILLCODE    0xDBDBDBDBDBDBDBDBUL
-	#else
-		#error No cpustack_t size supported!
-	#endif
-#endif
+/// Module logging format.
+#define KERN_LOG_FORMAT     LOG_FMT_VERBOSE
 
 #endif /*  CFG_KERN_H */