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

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index d59bc749..56f784d5 100644
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -39,60 +39,89 @@
 
 #include <kern/proc.h>
 #include <drv/timer.h>
+#include <cfg/test.h>
 
-#warning FIXME: Review this test and refactor for all target.
-
-/**
+/*
  * 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 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 cpustack_t proc_test1_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t proc_test2_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+
+
+int proc_testSetup(void)
+{
+	kdbg_init();
+	proc_init();
+	IRQ_ENABLE;
+	timer_init();
+	return 0;
+}
+
+int proc_testTearDown(void)
+{
+	return 0;
+}
 
 /**
- * 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");
+	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");
+
+	//kputs("stack1:\n");
+	//kdump(proc_test_stack1 + sizeof(proc_test_stack1) - 64, 64);
 
-	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);
+	//kputs("stack2:\n");
+	//kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64);
 
-	for (;;)
+	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">main task\n");
+		kputs("> main\n");
 		timer_delay(93);
 		proc_switch();
 	}
-
-	ASSERT(false);
+	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);
+#endif