Refactor switch context ASM files to comply to Wizard.

[bertos.git] / bertos / kern / proc.c

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 25ef1c67e4a29d8367cea39b6f8bf938b3770cea..9a1e410b11ffc60cb74df36ff4f07f95a6515a22 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -41,7 +41,8 @@
 #include "proc.h"
 
 #include "cfg/cfg_arch.h"  // ARCH_EMUL
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
 #include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
 #include <cfg/depend.h>    // CONFIG_DEPEND()
@@ -57,12 +58,6 @@
 
 #include <string.h>           /* memset() */
 
-// Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_SIGNALS,    CONFIG_KERN_SCHED);
-CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS);
-CONFIG_DEPEND(CONFIG_KERN_MONITOR,    CONFIG_KERN_SCHED);
-
-
 /*
  * The scheduer tracks ready processes by enqueuing them in the
  * ready list.
@@ -88,7 +83,7 @@ REGISTER Process *CurrentProcess;
  */
 List StackFreeList;
 
-#define NPROC 8
+#define NPROC 10
 cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
 #endif
 
@@ -103,6 +98,7 @@ static void proc_init_struct(Process *proc)
 
 #if CONFIG_KERN_SIGNALS
        proc->sig_recv = 0;
+       proc->sig_wait = 0;
 #endif
 
 #if CONFIG_KERN_HEAP
@@ -112,6 +108,7 @@ static void proc_init_struct(Process *proc)
 #if CONFIG_KERN_PRI
        proc->link.pri = 0;
 #endif
+
 }
 
 MOD_DEFINE(proc);
@@ -164,6 +161,7 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 #if (ARCH & ARCH_EMUL)
        /* Ignore stack provided by caller and use the large enough default instead. */
        PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList));
+       ASSERT(stack_base);
 
        stack_size = CONFIG_KERN_MINSTACKSIZE;
 #elif CONFIG_KERN_HEAP