From cb25e667d29d98c4e7c19d2d63d426760f492e7c Mon Sep 17 00:00:00 2001 From: batt Date: Wed, 25 Mar 2009 15:57:34 +0000 Subject: [PATCH] Split kernel config files. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2418 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/cfg_kern.h | 45 ++++++++----------------------------- bertos/cfg/cfg_monitor.h | 48 ++++++++++++++++++++++++++++++++++++++++ bertos/cfg/cfg_proc.h | 12 +++------- bertos/cfg/cfg_sem.h | 48 ++++++++++++++++++++++++++++++++++++++++ bertos/cfg/cfg_signal.h | 48 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 156 insertions(+), 45 deletions(-) create mode 100644 bertos/cfg/cfg_monitor.h create mode 100644 bertos/cfg/cfg_sem.h create mode 100644 bertos/cfg/cfg_signal.h diff --git a/bertos/cfg/cfg_kern.h b/bertos/cfg/cfg_kern.h index dd987b93..988e6de9 100644 --- a/bertos/cfg/cfg_kern.h +++ b/bertos/cfg/cfg_kern.h @@ -30,7 +30,7 @@ * Copyright 1999, 2000, 2001, 2008 Bernie Innocenti * --> * - * \brief Kernel configuration parameters + * \brief Kernel configuration parameters (deprecated) * * \version $Id$ * \author Bernie Innocenti @@ -39,44 +39,17 @@ #ifndef CFG_KERN_H #define CFG_KERN_H -/** - * Enable the multithreading kernel. - * - * $WIZ$ type = "boolean" - */ -#define CONFIG_KERN 1 - -#define CONFIG_KERN_SCHED 1 ///< Process schedling. $WIZ$ type = "boolean" -#define CONFIG_KERN_SIGNALS 1 ///< Inter-process signals. $WIZ$ type = "boolean" -#define CONFIG_KERN_IRQ 0 ///< Interrupt supervisor. $WIZ$ type = "boolean" -#define CONFIG_KERN_HEAP 0 ///< Dynamic memory allocation. $WIZ$ type = "boolean" -#define CONFIG_KERN_SEMAPHORES 1 ///< Re-entrant mutual exclusion primitives. $WIZ$ type = "boolean" -#define CONFIG_KERN_MONITOR 1 ///< Process monitor. $WIZ$ type = "boolean" -#define CONFIG_KERN_PREEMPT 0 ///< Preemptive process scheduling. $WIZ$ type = "boolean" -#define CONFIG_KERN_PRI 0 ///< Priority-based scheduling policy. $WIZ$ type = "boolean" - -/** - * [ms] Time sharing quantum (a prime number prevents interference effects) - * - * $WIZ$ type = "int" - * $WIZ$ min = "0" - */ -#define CONFIG_KERN_QUANTUM 47 +#warning This file is deprecated, you should use the correct combination of cfg_proc.h, cfg_sem.h, cfg_signal.h and cfg_monitor.h +#include "cfg_proc.h" +#include "cfg_sem.h" +#include "cfg_signal.h" +#include "cfg_monitor.h" -/** - * Module logging level. - * - * $WIZ$ type = "enum" - * $WIZ$ value_list = "log_level" - */ -#define KERN_LOG_LEVEL LOG_LVL_ERR /** - * Module logging level. - * - * $WIZ$ type = "enum" - * $WIZ$ value_list = "log_level" + * Left for backwards compatibility. + * Do not use this anymore, will be deprecated soon. */ -#define KERN_LOG_FORMAT LOG_FMT_VERBOSE +#define CONFIG_KERN_SCHED CONFIG_KERN #endif /* CFG_KERN_H */ diff --git a/bertos/cfg/cfg_monitor.h b/bertos/cfg/cfg_monitor.h new file mode 100644 index 00000000..ffe17c07 --- /dev/null +++ b/bertos/cfg/cfg_monitor.h @@ -0,0 +1,48 @@ +/** + * \file + * + * + * \brief Kernel monitor configuration parameters + * + * \version $Id$ + * \author Bernie Innocenti + */ + +#ifndef CFG_MONITOR_H +#define CFG_MONITOR_H + +/** + * Process monitor. + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_KERN_MONITOR 0 + +#endif /* CFG_MONITOR_H */ diff --git a/bertos/cfg/cfg_proc.h b/bertos/cfg/cfg_proc.h index 7b7785e1..e4489517 100644 --- a/bertos/cfg/cfg_proc.h +++ b/bertos/cfg/cfg_proc.h @@ -46,12 +46,6 @@ */ #define CONFIG_KERN 0 -/** - * Left for backwards compatibility, do not use. - * Will be deprecated. - */ -#define CONFIG_KERN_SCHED CONFIG_KERN - /** * Kernel interrupt supervisor. * $WIZ$ type = "boolean" @@ -66,7 +60,7 @@ #define CONFIG_KERN_HEAP 0 /** - * Preemptive process scheduling. WARNING: Experimental, do not use! + * Preemptive process scheduling. WARNING: Experimental, still incomplete! * * $WIZ$ type = "boolean" */ @@ -95,10 +89,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 diff --git a/bertos/cfg/cfg_sem.h b/bertos/cfg/cfg_sem.h new file mode 100644 index 00000000..2a6de7a9 --- /dev/null +++ b/bertos/cfg/cfg_sem.h @@ -0,0 +1,48 @@ +/** + * \file + * + * + * \brief Kernel semaphores configuration parameters. + * + * \version $Id$ + * \author Bernie Innocenti + */ + +#ifndef CFG_SEM_H +#define CFG_SEM_H + +/** + * Re-entrant mutual exclusion primitives. + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_KERN_SEMAPHORES 0 + +#endif /* CFG_SEM_H */ diff --git a/bertos/cfg/cfg_signal.h b/bertos/cfg/cfg_signal.h new file mode 100644 index 00000000..e78a4519 --- /dev/null +++ b/bertos/cfg/cfg_signal.h @@ -0,0 +1,48 @@ +/** + * \file + * + * + * \brief Kernel signals configuration parameters + * + * \version $Id$ + * \author Bernie Innocenti + */ + +#ifndef CFG_SIGNAL_H +#define CFG_SIGNAL_H + +/** + * Inter-process signals. + * $WIZ$ type = "autoenabled" + */ +#define CONFIG_KERN_SIGNALS 0 + +#endif /* CFG_SIGNAL_H */ -- 2.25.1