X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fkern%2Fproc_test.c;h=7c4cdc86442707a352eb8e64b2bb4d74a240ef25;hb=7a6e7a6b51151ca0c221e004871fc1e4c5748124;hp=e0030b7f57598411d0173e33540461dfdcef802e;hpb=bb31ab5597a5a4299204f8c674f129506e0acdfe;p=bertos.git

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index e0030b7f..7c4cdc86 100644
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -38,6 +38,8 @@
 
 #include <kern/proc.h>
 #include <kern/irq.h>
+#include <kern/monitor.h>
+
 #include <drv/timer.h>
 #include <cfg/test.h>
 
@@ -50,7 +52,6 @@ static void proc_test1(void)
 	{
 		kputs("> test1\n");
 		timer_delay(50);
-		proc_yield();
 	}
 }
 
@@ -66,8 +67,8 @@ static void proc_test2(void)
 	}
 }
 
-static cpustack_t proc_test1_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpustack_t)];
-static cpustack_t proc_test2_stack[CONFIG_KERN_MINSTACKSIZE / 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)];
 
 
 /**
@@ -83,12 +84,11 @@ int proc_testRun(void)
 	{
 		kputs("> main\n");
 		timer_delay(93);
-		proc_yield();
+		monitor_report();
 	}
 	return 0;
 }
 
-#if (ARCH & ARCH_UNITTEST)
 
 int proc_testSetup(void)
 {
@@ -109,24 +109,4 @@ 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