Imported some things from master

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index 78a2315..cf4fc75 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,14 +1,21 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <boot.h>
 #include <def.h>
+#include <serial.h>
 #include <vesa.h>
 
-void main(u32 *mem_info, struct vid_info *vid_info)
+void main(struct mem_info *mem_info, struct vid_info *vid_info)
 {
-	mem_info++; // TODO: Use the mmap!
+	mem_info++; // TODO: Use the mmap (or remove)!
 	vbe = vid_info->info;
 
 	u32 terminal_background[3] = { 0x1d, 0x1f, 0x24 };
 	vesa_clear(terminal_background);
 
+	serial_install();
+	serial_print("hello\n");
+
 	while (1) {
 	};
 }