aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-11-23 12:55:59 +0100
committerMarvin Borner2019-11-23 12:55:59 +0100
commit9702485247be55f092080a38e3fe3417ee6e6df3 (patch)
tree20d30dcd756232270beda490946be9e17f7d4e17 /src/kernel/kernel.c
parent945d1c9eb7a6520429ebf2f988ac6cc1d12ec75d (diff)
Fixed vesa, acpi and installation!
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 94d1c20..20a7199 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -19,8 +19,8 @@ void kernel_main() {
memory_init();
gdt_install();
init_serial();
+ acpi_install();
paging_install();
- // acpi_install();
idt_install();
isrs_install();
irq_install();
@@ -62,5 +62,7 @@ void kernel_main() {
*/
// asm volatile ("div %0" :: "r"(0)); // Exception testing x/0
- halt_loop();
+ loop:
+ asm volatile ("hlt");
+ goto loop;
}