aboutsummaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorMarvin Borner2021-04-29 14:36:40 +0200
committerMarvin Borner2021-04-29 14:36:40 +0200
commitf8e47b6b0c0578c52d82c0e243620361b87a4abe (patch)
treee42d898d299b7aa10c8f266d347b4fda5a5967f3 /kernel/main.c
parent04104fc051d44f4f9b3328f29b4be91fa4060f34 (diff)
Multiboot/Grub progress
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/main.c b/kernel/main.c
index e0e544b..37dd2da 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -3,6 +3,7 @@
#include <boot.h>
#include <cpu.h>
#include <fs.h>
+#include <gdt.h>
#include <ide.h>
#include <interrupts.h>
#include <io.h>
@@ -26,11 +27,11 @@ int kernel_main(u32 magic, u32 addr)
// Serial connection
serial_install();
serial_print("\nKernel was compiled at " __TIME__ " on " __DATE__ "\n");
- serial_print("Serial connected. LOOPING!\n");
+ serial_print("Serial connected!\n");
+
+ gdt_install();
multiboot_init(magic, addr);
- while (1)
- ;
memory_install();
memory_switch_dir(virtual_kernel_dir());