X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fkern%2Fpreempt.c;h=48a1278ebffa7b0d6df4937a417d2c08eb82b3bf;hb=cf5af2b25de263a964bf29a7465cdfe536d32e59;hp=398e8efe00221aae63ea7375c2a5ec58f0a82362;hpb=b90e284547eab472e3d9e478a058304bdd6b2da7;p=bertos.git diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c index 398e8efe..48a1278e 100644 --- a/bertos/kern/preempt.c +++ b/bertos/kern/preempt.c @@ -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);