more stuff
This commit is contained in:
+6
-6
@@ -1,7 +1,7 @@
|
||||
#include <zinnia/atomic.h>
|
||||
#include <zinnia/irq.h>
|
||||
#include <zinnia/percpu.h>
|
||||
#include <arch/irq.h>
|
||||
#include <stdatomic.h>
|
||||
|
||||
void irq_set_state(bool state) {
|
||||
arch_irq_set_state(state);
|
||||
@@ -17,19 +17,19 @@ void irq_wait() {
|
||||
|
||||
void irq_lock() {
|
||||
struct irq_percpu* cpu = &percpu_get()->irq;
|
||||
if (atomic_load_explicit(&cpu->in_interrupt, memory_order_acquire))
|
||||
if (atomic_load(&cpu->in_interrupt, ATOMIC_ACQUIRE))
|
||||
return;
|
||||
|
||||
arch_irq_set_state(false);
|
||||
atomic_fetch_add_explicit(&percpu_get()->irq.level, 1, memory_order_acq_rel);
|
||||
atomic_fetch_add(&percpu_get()->irq.level, 1, ATOMIC_ACQ_REL);
|
||||
}
|
||||
|
||||
void irq_unlock() {
|
||||
struct irq_percpu* cpu = &percpu_get()->irq;
|
||||
if (atomic_load_explicit(&cpu->in_interrupt, memory_order_acquire))
|
||||
if (atomic_load(&cpu->in_interrupt, ATOMIC_ACQUIRE))
|
||||
return;
|
||||
|
||||
uint32_t old_level = atomic_fetch_sub_explicit(&cpu->level, 1, memory_order_acq_rel);
|
||||
uint32_t old_level = atomic_fetch_sub(&cpu->level, 1, ATOMIC_ACQ_REL);
|
||||
// If it was 1, the new IRQ level is now 0.
|
||||
if (old_level == 1) {
|
||||
arch_irq_set_state(true);
|
||||
@@ -37,5 +37,5 @@ void irq_unlock() {
|
||||
}
|
||||
|
||||
bool irq_set_interrupted(bool is_interrupted) {
|
||||
return atomic_exchange_explicit(&percpu_get()->irq.in_interrupt, is_interrupted, memory_order_release);
|
||||
return atomic_exchange(&percpu_get()->irq.in_interrupt, is_interrupted, ATOMIC_RELEASE);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user