X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_test.c;h=6d75b98ee75e698b2eefa6f34d4946fd53de3077;hb=6c8041d7c8b7f20f15d4de0eaf9bcdb121289465;hp=d59bc749ad6d1517b26bf827ff079598d7337a20;hpb=60d54449c12ed139911df35a9983c14019262d37;p=bertos.git

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index d59bc749..6d75b98e 100644
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -26,73 +26,88 @@
  * 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 <drv/timer.h>
+#include <kern/irq.h>
+#include <kern/monitor.h>
 
-#warning FIXME: Review this test and refactor for all target.
+#include <drv/timer.h>
+#include <cfg/test.h>
 
-/**
+/*
  * Proc scheduling test subthread 1
  */
-static void NORETURN proc_test_thread1(void)
+static void proc_test1(void)
 {
-	for (;;)
+	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 NORETURN proc_test_thread2(void)
+static void proc_test2(void)
 {
-	for (;;)
+	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)];
+static cpu_stack_t proc_test1_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
+static cpu_stack_t proc_test2_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
+
 
 /**
- * Proc scheduling test
+ * Process scheduling test
  */
-void NORETURN proc_test(void)
+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");
-//	#warning FIXME
-	kdump(proc_test_stack1+sizeof(proc_test_stack1)-64, 64);
-	kputs("stack2:\n");
-//	#warning FIXME
-	kdump(proc_test_stack2+sizeof(proc_test_stack1)-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 (;;)
+	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">main task\n");
+		kputs("> main\n");
 		timer_delay(93);
-		proc_switch();
+		monitor_report();
 	}
+	return 0;
+}
+
 
-	ASSERT(false);
+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;
+}
+
+TEST_MAIN(proc);