Use a better name.

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

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index 4b1ad9ee2d5dea8e213570eeb1c59fc400290fa6..48a1278ebffa7b0d6df4937a417d2c08eb82b3bf 100644 (file)
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -40,11 +40,11 @@
  * In the POSIX implementaiton, context switching is done by the portable
  * SVR4 swapcontext() facility.
  *
- * \version $Id: proc.c 1616 2008-08-10 19:41:26Z bernie $
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
 
 #if CONFIG_KERN_PREEMPT
 
@@ -61,7 +61,7 @@
 #include <cfg/depend.h>    // CONFIG_DEPEND()
 
 // Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_PREEMPT,    CONFIG_KERN_SCHED && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
+CONFIG_DEPEND(CONFIG_KERN_PREEMPT, CONFIG_KERN && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
 
 MOD_DEFINE(preempt)
 
@@ -75,7 +75,7 @@ void proc_schedule(void)
 {
        IRQ_DISABLE;
 
-       ASSERT(proc_allowed());
+       ASSERT(proc_preemptAllowed());
        LIST_ASSERT_VALID(&ProcReadyList);
        CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
        ASSERT2(CurrentProcess, "no idle proc?");
@@ -87,7 +87,7 @@ void proc_schedule(void)
 
 void proc_preempt(UNUSED_ARG(void *, param))
 {
-       if (proc_allowed())
+       if (proc_preemptAllowed())
        {
                IRQ_DISABLE;
 
@@ -123,7 +123,7 @@ void proc_switch(void)
 
        /* Sleeping with IRQs disabled or preemption forbidden is illegal */
        IRQ_ASSERT_ENABLED();
-       ASSERT(proc_allowed());
+       ASSERT(proc_preemptAllowed());
 
        // Will invoke proc_switch() in interrupt context
        kill(0, SIGUSR1);