From e6bec1afcd1c351c13db821a4bb5e899a6c37901 Mon Sep 17 00:00:00 2001 From: Tyler Murphy <=> Date: Mon, 17 Jul 2023 00:09:26 -0400 Subject: paging --- kernel/src/main.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'kernel/src/main.c') diff --git a/kernel/src/main.c b/kernel/src/main.c index 7c0f221..da5879a 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -12,12 +12,18 @@ #include #include +#include #include #include static double x = 0, y = 0; -void kernel_main(void* boot_info) { +void kernel_boot(void *boot_info) { + (void)boot_info; +} + + +void kernel_main(void) { term_init(); cursor_enable(); @@ -28,16 +34,16 @@ void kernel_main(void* boot_info) { idt_init(); pic_remap(PIC_REMAP_OFFSET); - load_boot_info(boot_info); - acpi_init(); + // load_boot_info(boot_info); + // acpi_init(); - memory_init(); + // memory_init(); ps2ctrl_init(); ps2kb_init(); ps2mouse_init(); - init_registers(); + init_registers(FPU_REG | SSE_REG); while(1) { int_wait(); -- cgit v1.2.3-freya