rename cpuXXX_t to cpu_XXX_t

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

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index a9201f61cb7a8413e093d77038e128620d536a1e..4b1ad9ee2d5dea8e213570eeb1c59fc400290fa6 100644 (file)
--- 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>
@@ -64,20 +65,17 @@ CONFIG_DEPEND(CONFIG_KERN_PREEMPT,    CONFIG_KERN_SCHED && CONFIG_TIMER_EVENTS &
 
 MOD_DEFINE(preempt)
 
-int preempt_forbid_cnt;
+/// Global preemption disabling nesting counter
+cpu_atomic_t _preempt_forbid_cnt;
 
 static Timer preempt_timer;
 
 
-// fwd decl from idle.c
-void idle_init(void);
-
-
 void proc_schedule(void)
 {
        IRQ_DISABLE;
 
-       ASSERT(preempt_forbid_cnt == 0);
+       ASSERT(proc_allowed());
        LIST_ASSERT_VALID(&ProcReadyList);
        CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
        ASSERT2(CurrentProcess, "no idle proc?");
@@ -87,9 +85,9 @@ void proc_schedule(void)
        TRACEMSG("launching %p:%s", CurrentProcess, proc_currentName());
 }
 
-void proc_preempt(UNUSED_ARG(void *, param)
+void proc_preempt(UNUSED_ARG(void *, param))
 {
-       if (!preempt_forbid_cnt)
+       if (proc_allowed())
        {
                IRQ_DISABLE;
 
@@ -125,7 +123,7 @@ void proc_switch(void)
 
        /* Sleeping with IRQs disabled or preemption forbidden is illegal */
        IRQ_ASSERT_ENABLED();
-       ASSERT(preempt_forbid_cnt == 0);
+       ASSERT(proc_allowed());
 
        // Will invoke proc_switch() in interrupt context
        kill(0, SIGUSR1);
@@ -155,7 +153,7 @@ void preempt_init(void)
 
        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);