Fix PowerPC support

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

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index d59bc749ad6d1517b26bf827ff079598d7337a20..79b7660e1fb2e858f9bc16b925fdd48fb1d5b8f1 100644 (file)
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -39,15 +39,14 @@
 
 #include <kern/proc.h>
 #include <drv/timer.h>
-
-#warning FIXME: Review this test and refactor for all target.
+#include <cfg/test.h>
 
 /**
  * Proc scheduling test subthread 1
  */
-static void NORETURN proc_test_thread1(void)
+static void proc_test_thread1(void)
 {
-       for (;;)
+       for (int i = 0; i < 30; ++i)
        {
                kputs(">task 1\n");
                timer_delay(50);
@@ -58,9 +57,9 @@ static void NORETURN proc_test_thread1(void)
 /**
  * Proc scheduling test subthread 2
  */
-static void NORETURN proc_test_thread2(void)
+static void proc_test_thread2(void)
 {
-       for (;;)
+       for (int i = 0; i < 30; ++i)
        {
                kputs(">task 2\n");
                timer_delay(75);
@@ -71,28 +70,58 @@ static void NORETURN proc_test_thread2(void)
 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;
+}
+
+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");
 
        kputs("stack1:\n");
-//     #warning FIXME
-       kdump(proc_test_stack1+sizeof(proc_test_stack1)-64, 64);
+       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);
+       kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64);
 
-       for (;;)
+       for (int i = 0; i < 30; ++i)
        {
                kputs(">main task\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