From 382ee1b11be7e01d2797efe4ccd97ad7c5a4cf72 Mon Sep 17 00:00:00 2001
From: Ada Christine <adachristine18@gmail.com>
Date: Wed, 7 Apr 2021 11:16:11 +0000
Subject: moved headers around a bit

---
 kernel/cpu.c       |  1 -
 kernel/entry_efi.c | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'kernel')

diff --git a/kernel/cpu.c b/kernel/cpu.c
index d5c6675..db4108f 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -60,7 +60,6 @@ struct task64_segment
     uint16_t iomap_base;
 };
 
-// TODO: is 16 enough?
 static struct segment_descriptor gdt[GDT_ENTRIES];
 static struct gate_descriptor idt[IDT_ENTRIES];
 static struct task64_segment tss;
diff --git a/kernel/entry_efi.c b/kernel/entry_efi.c
index 4eaebc0..646c00d 100644
--- a/kernel/entry_efi.c
+++ b/kernel/entry_efi.c
@@ -1,4 +1,5 @@
-#include <boot/entry_efi.h>
+#include <loader/data.h>
+#include <kernel/entry.h>
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -11,7 +12,7 @@
 #include "memory.h"
 
 static noreturn void hang(void);
-
+/*
 static void free_memory_descriptor(EFI_MEMORY_DESCRIPTOR *desc)
 {
     kputs("free_memory_descriptor() called\r\n");
@@ -48,13 +49,15 @@ static void parse_efi_memmap(struct efi_memory_map_data *map)
         }
     }
 }
-
+*/
 noreturn void kernel_entry(struct efi_boot_data *data)
 {
+    (void)data;
     cpu_init();
     serial_init();
+    memory_init();
     kputs("<hacker voice> i'm in\r\n");
-    parse_efi_memmap(data->memory_map);
+    //parse_efi_memmap(data->memory_map);
     hang();
 }
 
-- 
cgit v1.3.1-1-g115d