Factor out from cfg_kern kernel related default.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1563 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/app/demo/cfg/cfg_kern.h b/app/demo/cfg/cfg_kern.h
index 086bdf1148585eb963e32534d9b0c95220a8d01d..fd9371abf8d2098362bff8776a861f847c0ec015 100644 (file)
--- a/app/demo/cfg/cfg_kern.h
+++ b/app/demo/cfg/cfg_kern.h
@@ -67,59 +67,4 @@
 
 #define CONFIG_KERN_QUANTUM     50    /**< Time sharing quantum in timer ticks. */
 
-#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
-
-/* 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
-
 #endif /*  CFG_KERN_H */

diff --git a/bertos/cfg/cfg_kern.h b/bertos/cfg/cfg_kern.h
index 2188b72da209234b53622f3ce3b1d5de61ed7f05..368e59d0387fed43e07a9602542dca0f24e41c55 100644 (file)
--- a/bertos/cfg/cfg_kern.h
+++ b/bertos/cfg/cfg_kern.h
@@ -67,59 +67,5 @@
 
 #define CONFIG_KERN_QUANTUM     50    /**< Time sharing quantum in timer ticks. */
 
-#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
-
-/* 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
 
 #endif /*  CFG_KERN_H */

diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h
index a668c18f4b0b1e3e7273d48b16033d87ee4d1a8f..87fed5e1bbcdae306939c177aea98d25c40e3bae 100644 (file)
--- a/bertos/kern/proc.h
+++ b/bertos/kern/proc.h
@@ -83,4 +83,62 @@ void proc_rename(struct Process *proc, const char* name);
                proc_permit(); \
        } while(0)
 
+#ifndef CONFIG_PROC_DEFSTACKSIZE
+
+       #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
+#endif
+
+/* OBSOLETE */
+#define CONFIG_KERN_DEFSTACKSIZE CONFIG_PROC_DEFSTACKSIZE
+
+/* 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)
+               /* 32bit cpustack_t */
+               #define CONFIG_KERN_STACKFILLCODE  0xA5A5A5A5UL
+               #define CONFIG_KERN_MEMFILLCODE    0xDBDBDBDBUL
+       #elif (SIZEOF_CPUSTACK_T == 8)
+               /* 64bit cpustack_t */
+               #define CONFIG_KERN_STACKFILLCODE  0xA5A5A5A5A5A5A5A5ULL
+               #define CONFIG_KERN_MEMFILLCODE    0xDBDBDBDBDBDBDBDBULL
+       #else
+               #error No cpustack_t size supported!
+       #endif
+#endif
 #endif /* KERN_PROC_H */
+