X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_test.c;h=414f2115f5213dc28dd49577ea0798f4e2c8a983;hb=0eeba5822b3ff0e76ae0fd0272536d371d272d7d;hp=d952f8212e69d6633dc5b14ab2dc4cc8ef209d11;hpb=e316741ea74fc7d22ef8861c33d56b9b83961ae6;p=bertos.git

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index d952f821..414f2115 100644
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -26,102 +26,107 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2008 Develer S.r.l. (http://www.develer.com/)
  * -->
  *
  *
  * \brief Test kernel process.
  *
  * \version $Id$
- *
  * \author Daniele Basile <asterix@develer.com>
  */
 
 #include <kern/proc.h>
+#include <kern/irq.h>
 #include <drv/timer.h>
 #include <cfg/test.h>
 
 /*
  * Proc scheduling test subthread 1
  */
-static void proc_test_thread1(void)
+static void proc_test1(void)
 {
 	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">task 1\n");
+		kputs("> test1\n");
 		timer_delay(50);
-		proc_switch();
+		proc_yield();
 	}
 }
 
 /*
  * Proc scheduling test subthread 2
  */
-static void proc_test_thread2(void)
+static void proc_test2(void)
 {
 	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">task 2\n");
+		kputs("> test2\n");
 		timer_delay(75);
-		proc_switch();
 	}
 }
 
-static cpustack_t proc_test_stack1[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
-static cpustack_t proc_test_stack2[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
-
-
-int proc_testSetup(void)
-{
-	kdbg_init();
-	proc_init();
-	IRQ_ENABLE;
-	timer_init();
-	return 0;
-}
+static cpustack_t proc_test1_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t proc_test2_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpustack_t)];
 
-int proc_testTearDown(void)
-{
-	return 0;
-}
 
 /**
  * Process scheduling test
  */
 int proc_testRun(void)
 {
-	proc_new(proc_test_thread1, NULL, sizeof(proc_test_stack1), proc_test_stack1);
-	proc_new(proc_test_thread2, NULL, sizeof(proc_test_stack2), proc_test_stack2);
-	kputs("Created tasks\n");
-
-	kputs("stack1:\n");
-	kdump(proc_test_stack1 + sizeof(proc_test_stack1) - 64, 64);
-
-	kputs("stack2:\n");
-	kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64);
+	proc_new(proc_test1, NULL, sizeof(proc_test1_stack), proc_test1_stack);
+	proc_new(proc_test2, NULL, sizeof(proc_test2_stack), proc_test2_stack);
+	kputs("Processes created\n");
 
 	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">main task\n");
+		kputs("> main\n");
 		timer_delay(93);
-		proc_switch();
+		proc_yield();
 	}
 	return 0;
 }
-#warning Fix test to comply to new policy.
-#if 0
-/*
- * FIXME: to be compiled as a single file 
- * the kernel module needs the assembly switch function
- * and the idle() that lay in a emulator cpp file.
- * How can we fix this?
- */
-#include TEST_ONLY(drv/kdebug.c)
-#include TEST_ONLY(kern/proc.c)
-#include TEST_ONLY(drv/timer.c)
-#include TEST_ONLY(mware/formatwr.c)
-#include TEST_ONLY(mware/hex.c)
-#include TEST_ONLY(os/hptime.c)
 
-TEST_MAIN(proc);
+#ifdef _TEST
+
+int proc_testSetup(void)
+{
+	kdbg_init();
+
+	#if CONFIG_KERN_PREEMPT
+		irq_init();
+	#endif
+
+	timer_init();
+
+	proc_init();
+	return 0;
+}
+
+int proc_testTearDown(void)
+{
+	return 0;
+}
+
+#include <drv/kdebug.c>
+#include <drv/timer.c>
+#include <kern/idle.c>
+#include <kern/monitor.c>
+#include <kern/signal.c>
+#if CONFIG_KERN_PREEMPT
+	#include <kern/preempt.c>
+	#include <kern/irq.c>
+#else
+	#include <kern/coop.c>
+	// FIXME: we need to link with the switch asm code too!
 #endif
+#include <kern/proc.c>
+#include <mware/formatwr.c>
+#include <mware/hex.c>
+#include <mware/event.c>
+#include <os/hptime.c>
+
+TEST_MAIN(proc);
+
+#endif // _TEST