aboutsummaryrefslogtreecommitdiff
path: root/src/sys
diff options
context:
space:
mode:
authorChristian Cunningham <cc@localhost>2021-12-21 21:30:00 -0800
committerChristian Cunningham <cc@localhost>2021-12-21 21:30:00 -0800
commite683cbf70122454eb25899970202b5fefabe4207 (patch)
tree4711d29935ed47669be0414f4e34e89ad6d7edfc /src/sys
parentd3d87c5fd8096c2b5730ba9664635af560505fd7 (diff)
More terse
Diffstat (limited to 'src/sys')
-rw-r--r--src/sys/core.c5
-rw-r--r--src/sys/kernel.S4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/sys/core.c b/src/sys/core.c
index bd6df21..f28ef44 100644
--- a/src/sys/core.c
+++ b/src/sys/core.c
@@ -1,3 +1,4 @@
+#include "../cpu/irq.h"
#include "../drivers/uart.h"
#include "../graphics/draw.h"
#include "../lib/mem.h"
@@ -49,6 +50,10 @@ void sysinit() {
//init_graphics();
//draw_box(0x01FE, 0, 0, 640, 480);
//draw_box(0xFFFF, 2, 2, 10, 10);
+
+ // Enable IRQ & FIQ
+ enableirq();
+ enablefiq();
}
// Checks IRQ status
diff --git a/src/sys/kernel.S b/src/sys/kernel.S
index f919213..f74bc6a 100644
--- a/src/sys/kernel.S
+++ b/src/sys/kernel.S
@@ -4,11 +4,9 @@
kernel_main:
push {lr}
bl sysinit
- cpsie i // Enable IRQ
- cpsie f // Enable FIQ
bl postinit
kernel_main.loop:
- bl io_halt
+ wfi
b kernel_main.loop
pop {lr}