...

src/arch/x86_64/main.c

@@ -1,12 +1,13 @@
+#include "arch.h"
 #include "console/console.h"
 #include "interrupts/idt.h"
 #include "interrupts/irq.h"
 #include "kernel.h"
-#include "memory/mmap.h"
+#include "mem.h"
 #include "panic.h"
 #include "util.h"
 
-void x86_64_main(uint32_t magic, multiboot_info_t* info)
+void x86_64_main(u32 magic, multiboot_info_t* info)
 {
     console_clear();
 
@@ -21,28 +22,20 @@ void x86_64_main(uint32_t magic, multiboot_info_t* info)
     }
 
     idt_init();
+
+    mem_init(info);
+
     remap_pic();
-    map_memory(info);
     enable_interrupts();
     kernel_main();
 }
 
-void arch_console_putchar(char c)
+void console_putchar(char c)
 {
     console_put_char(c, VGA_DEFAULT_COLOR);
 }
 
-uint64_t arch_page_size()
-{
-    return 4096;
-}
-
 arch_api_t arch_api = {
-    .panic = panic,
-    .putchar = arch_console_putchar,
-    .page_size = arch_page_size,
-    .enable_interrupts = enable_interrupts,
-    .disable_interrupts = disable_interrupts,
-    .get_memory_map = get_memory_map,
+    .putchar = console_putchar,
     .halt = halt,
 };