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

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index d952f821..a32d667e 100644
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -44,31 +44,30 @@
 /*
  * 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)];
+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)
@@ -90,21 +89,21 @@ int proc_testTearDown(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");
+	//kdump(proc_test_stack1 + sizeof(proc_test_stack1) - 64, 64);
 
-	kputs("stack2:\n");
-	kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64);
+	//kputs("stack2:\n");
+	//kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64);
 
 	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">main task\n");
+		kputs("> main\n");
 		timer_delay(93);
-		proc_switch();
+		proc_yield();
 	}
 	return 0;
 }
@@ -117,6 +116,7 @@ int proc_testRun(void)
  * How can we fix this?
  */
 #include TEST_ONLY(drv/kdebug.c)
+#include TEST_ONLY(kern/coop.c)
 #include TEST_ONLY(kern/proc.c)
 #include TEST_ONLY(drv/timer.c)
 #include TEST_ONLY(mware/formatwr.c)