Merge branch "preempt" in "trunk".

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

diff --git a/bertos/kern/signal_test.c b/bertos/kern/signal_test.c
index ca63002b15c6c1ca4780a970a786f4c9bda6cfe2..484c0338e1c2c783a77aa30407866b4b9a2fda08 100644 (file)
--- a/bertos/kern/signal_test.c
+++ b/bertos/kern/signal_test.c
@@ -35,9 +35,16 @@
  * \version $Id$
  *
  * \author Daniele Basile <asterix@develer.com>
+ *
+ * $test$: cp bertos/cfg/cfg_proc.h $cfgdir/
+ * $test$: echo  "#undef CONFIG_KERN" >> $cfgdir/cfg_proc.h
+ * $test$: echo "#define CONFIG_KERN 1" >> $cfgdir/cfg_proc.h
+ * $test$: cp bertos/cfg/cfg_signal.h $cfgdir/
+ * $test$: echo  "#undef CONFIG_KERN_SIGNALS" >> $cfgdir/cfg_signal.h
+ * $test$: echo "#define CONFIG_KERN_SIGNALS 1" >> $cfgdir/cfg_signal.h
  */
 
-#include <cfg/cfg_timer.h>
+#include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
 #include <cfg/test.h>
 
@@ -68,16 +75,17 @@ sigmask_t sig_to_slave;
 /*
  * These macros generate the code needed to create the test process functions.
  */
-#define PROC_TEST_SLAVE(index, signal) static void proc_test##index(void) \
+#define PROC_TEST_SLAVE(index, signal) \
+static void NORETURN proc_signalTest##index(void) \
 { \
        for(;;) \
        { \
-               kprintf("> Slave [%d]: Wait signal [%d]\n", index, signal); \
+               kputs("> Slave [" #index "]: Wait signal [" #signal "]\n"); \
                sig_wait(signal); \
-               kprintf("> Slave [%d]: send signal [%d]\n", index, signal); \
+               kputs("> Slave [" #index "]: send signal [" #signal "]\n"); \
                sig_signal(proc_currentUserData(), signal); \
        } \
-} \
+}
 
 #define MAIN_CHECK_SIGNAL(index, slave) \
        do { \
@@ -88,8 +96,8 @@ sigmask_t sig_to_slave;
                count++; \
        } while(0) \
 
-#define PROC_TEST_SLAVE_STACK(index) static cpu_stack_t proc_test##index##_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
-#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_test##index, master_process, sizeof(proc_test##index##_stack), proc_test##index##_stack)
+#define PROC_TEST_SLAVE_STACK(index) PROC_DEFINE_STACK(proc_signal_test##index##_stack, KERN_MINSTACKSIZE);
+#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_signalTest##index, master_process, sizeof(proc_signal_test##index##_stack), proc_signal_test##index##_stack)
 
 // Generate the code for signal test.
 PROC_TEST_SLAVE(0, SIG_USER0)
@@ -158,12 +166,6 @@ int signal_testSetup(void)
 {
        kdbg_init();
 
-       #if CONFIG_KERN_PREEMPT
-               kprintf("Init Interrupt (preempt mode)..");
-               irq_init();
-               kprintf("Done.\n");
-       #endif
-
        kprintf("Init Timer..");
        timer_init();
        kprintf("Done.\n");