Updated part14 to reflect changes to part13

babbleberry · Feb 6, 2024 · 71c3b30 · 71c3b30
1 parent 31bb21b
commit 71c3b30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/part14-spi-ethernet/kernel/irq.c b/part14-spi-ethernet/kernel/irq.c
@@ -11,7 +11,7 @@ void disable_interrupt_controller() {
 void handle_irq() {
     unsigned int irq = REGS_IRQ->irq0_pending_0;
 
-    while(irq) {
+    while(irq & (SYS_TIMER_IRQ_1 | SYS_TIMER_IRQ_3)) {
         if (irq & SYS_TIMER_IRQ_1) {
             irq &= ~SYS_TIMER_IRQ_1;
 

diff --git a/part14-spi-ethernet/kernel/kernel.c b/part14-spi-ethernet/kernel/kernel.c
@@ -147,6 +147,7 @@ void main(void)
 
     irq_init_vectors();
     enable_interrupt_controller();
+    irq_barrier();
     irq_enable();
     timer_init();
 

diff --git a/part14-spi-ethernet/kernel/kernel.h b/part14-spi-ethernet/kernel/kernel.h
@@ -38,6 +38,7 @@ enum vc_irqs {
 
 void irq_init_vectors();
 void irq_enable();
+void irq_barrier();
 void irq_disable();
 void enable_interrupt_controller();
 void disable_interrupt_controller();

diff --git a/part14-spi-ethernet/kernel/utils.S b/part14-spi-ethernet/kernel/utils.S
@@ -13,3 +13,8 @@ irq_enable:
 irq_disable:
     msr daifset, #2
     ret
+
+.globl irq_barrier
+irq_barrier:
+    dsb sy
+    ret