APIC/ACPI/keyboard stuff. I now get interrupts when a key is pressed

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index a3b7719..eddba5e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,12 @@ main(struct boot_info *info)
 
 	setup_descriptors();
 	setup_paging(info);
+	setup_acpi(info->rsdp, &info->ioapic);
+	setup_apic(&info->ioapic);
+	setup_keyboard();
 
-	int *x = (int*)0xBEEF;
-	*x = 4; /* This should give us a page fault, and trigger the panic function */
+	halt();
+
+//	int *x = (int*)0x0001;
+//	*x = 4; /* This should give us a page fault, and trigger the panic function */
 }