Switch to new kernel config files.

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

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 577f0db43e2d8a6925b55e09229c5461d69a715d..9a1e410b11ffc60cb74df36ff4f07f95a6515a22 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -30,8 +30,7 @@
  * Copyright 1999, 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
- * \brief Simple realtime multitasking scheduler.
- *        Context switching is only done cooperatively.
+ * \brief Simple cooperative multitasking scheduler.
  *
  * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
@@ -41,8 +40,10 @@
 #include "proc_p.h"
 #include "proc.h"
 
-#include "cfg/cfg_arch.h"  /* ARCH_EMUL */
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_arch.h"  // ARCH_EMUL
+#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()
 
@@ -51,13 +52,11 @@
 #include <cpu/attr.h>
 #include <cpu/frame.h>
 
-#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);
+#if CONFIG_KERN_HEAP
+       #include <struct/heap.h>
+#endif
 
+#include <string.h>           /* memset() */
 
 /*
  * The scheduer tracks ready processes by enqueuing them in the
@@ -84,8 +83,8 @@ REGISTER Process *CurrentProcess;
  */
 List StackFreeList;
 
-#define NPROC 8
-cpustack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpustack_t)];
+#define NPROC 10
+cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
 #endif
 
 /** The main process (the one that executes main()). */
@@ -99,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
@@ -108,6 +108,7 @@ static void proc_init_struct(Process *proc)
 #if CONFIG_KERN_PRI
        proc->link.pri = 0;
 #endif
+
 }
 
 MOD_DEFINE(proc);
@@ -148,10 +149,10 @@ void proc_init(void)
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
-struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpu_stack_t *stack_base)
 {
        Process *proc;
-       const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
+       const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpu_stack_t)) / sizeof(cpu_stack_t);
 #if CONFIG_KERN_HEAP
        bool free_stack = false;
 #endif
@@ -159,7 +160,8 @@ 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 = (cpustack_t *)list_remHead(&StackFreeList));
+       PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList));
+       ASSERT(stack_base);
 
        stack_size = CONFIG_KERN_MINSTACKSIZE;
 #elif CONFIG_KERN_HEAP
@@ -186,8 +188,13 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 #endif // !ARCH_EMUL && !CONFIG_KERN_HEAP
 
 #if CONFIG_KERN_MONITOR
-       /* Fill-in the stack with a special marker to help debugging */
-       memset(stack_base, CONFIG_KERN_STACKFILLCODE, stack_size);
+       /*
+        * Fill-in the stack with a special marker to help debugging.
+        * On 64bit platforms, CONFIG_KERN_STACKFILLCODE is larger
+        * than an int, so the (int) cast is required to silence the
+        * warning for truncating its size.
+        */
+       memset(stack_base, (int)CONFIG_KERN_STACKFILLCODE, stack_size);
 #endif
 
        /* Initialize the process control block */
@@ -200,8 +207,8 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
        }
        else
        {
-               proc = (Process *)(stack_base + stack_size / sizeof(cpustack_t) - PROC_SIZE_WORDS);
-               proc->stack = (cpustack_t *)proc;
+               proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS);
+               proc->stack = (cpu_stack_t *)proc;
                if (CPU_SP_ON_EMPTY_SLOT)
                        proc->stack--;
        }
@@ -354,19 +361,11 @@ void proc_exit(void)
 #endif /* ARCH_EMUL */
 
        CurrentProcess = NULL;
-       proc_schedule();
+       proc_switch();
        /* not reached */
 }
 
 
-/**
- * Get the pointer to the current process
- */
-struct Process *proc_current(void)
-{
-       return CurrentProcess;
-}
-
 /**
  * Get the pointer to the user data of the current process
  */