X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fpreempt.c;h=c3d212d446b30c9816d86cbc858515e0c304e517;hb=d3860ea45a63b0443e4e75a16b402ada83078d12;hp=af9555d089ba178eabfefde97e8490b09032ad6d;hpb=1cb9650308fd1266bdb3199acac38c188ca5e355;p=bertos.git

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index af9555d0..c3d212d4 100644
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -50,6 +50,7 @@
 
 #include "proc_p.h"
 #include "proc.h"
+#include "idle.h"
 
 #include <kern/irq.h>
 #include <kern/monitor.h>
@@ -69,11 +70,7 @@ int preempt_forbid_cnt;
 static Timer preempt_timer;
 
 
-// fwd decl from idle.c
-void idle_init(void);
-
-
-void proc_preempt(void)
+void proc_schedule(void)
 {
 	IRQ_DISABLE;
 
@@ -87,7 +84,7 @@ void proc_preempt(void)
 	TRACEMSG("launching %p:%s", CurrentProcess, proc_currentName());
 }
 
-void proc_preempt_timer(UNUSED_ARG(void *, param))
+void proc_preempt(UNUSED_ARG(void *, param))
 {
 	if (!preempt_forbid_cnt)
 	{
@@ -101,10 +98,10 @@ void proc_preempt_timer(UNUSED_ARG(void *, param))
 
 		TRACEMSG("preempting %p:%s", CurrentProcess, proc_currentName());
 
-// FIXME: this still break havocs, probably because of some reentrancy issue
+// FIXME: this still breaks havoc, probably because of some reentrancy issue
 #if 0
 		SCHED_ENQUEUE(CurrentProcess);
-		proc_preempt();
+		proc_schedule();
 #endif
 		#if CONFIG_KERN_PRI
 			}
@@ -117,7 +114,7 @@ void proc_preempt_timer(UNUSED_ARG(void *, param))
 	timer_add(&preempt_timer);
 }
 
-void proc_schedule(void)
+void proc_switch(void)
 {
 	ATOMIC(LIST_ASSERT_VALID(&ProcReadyList));
 	TRACEMSG("%p:%s", CurrentProcess, proc_currentName());
@@ -127,7 +124,7 @@ void proc_schedule(void)
 	IRQ_ASSERT_ENABLED();
 	ASSERT(preempt_forbid_cnt == 0);
 
-	// Will invoke proc_preempt() in interrupt context
+	// Will invoke proc_switch() in interrupt context
 	kill(0, SIGUSR1);
 }
 
@@ -139,7 +136,7 @@ void proc_yield(void)
 	SCHED_ENQUEUE(CurrentProcess);
 	IRQ_ENABLE;
 
-	proc_schedule();
+	proc_switch();
 }
 
 void proc_entry(void (*user_entry)(void))
@@ -153,9 +150,9 @@ void preempt_init(void)
 	MOD_CHECK(irq);
 	MOD_CHECK(timer);
 
-	irq_register(SIGUSR1, proc_preempt);
+	irq_register(SIGUSR1, proc_schedule);
 
-	timer_setSoftint(&preempt_timer, proc_preempt_timer, NULL);
+	timer_setSoftint(&preempt_timer, proc_preempt, NULL);
 	timer_setDelay(&preempt_timer, CONFIG_KERN_QUANTUM);
 	timer_add(&preempt_timer);