From 7786aca4ebabc78048ca2442b6734e99ba631872 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 28 Jul 2020 21:05:23 +0200
Subject: Added matrix

---
 src/config.h |  2 +-
 src/main.c   | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/config.h b/src/config.h
index 789a80f..4d8f5ce 100644
--- a/src/config.h
+++ b/src/config.h
@@ -6,7 +6,7 @@
 
 int MELVIX_VERSION = 0;
 
-#define USERNAME "melvin"
+#define USERNAME "Neo"
 #define FONT_PATH "/font/ter-p32n.psf"
 //#define FONT_PATH "/font/spleen-16x32.psfu"
 #define NETWORK "rtl8139"
diff --git a/src/main.c b/src/main.c
index 5b3d525..e7ccdbc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,6 +9,7 @@
 #include <keyboard.h>
 #include <print.h>
 #include <serial.h>
+/* #include <timer.h> */
 
 u32 HEAP = 0x00200000;
 u32 HEAP_START;
@@ -16,21 +17,30 @@ u32 HEAP_START;
 void main(struct mem_info *mem_info, struct vid_info *vid_info)
 {
 	HEAP_START = HEAP; // For malloc function
-	interrupts_install();
-	keyboard_install();
-
-	mem_info++; // TODO: Use the mmap (or remove)!
 
+	// Initialize VESA video
 	vesa_init(vid_info->info);
 	u32 terminal_background[3] = { 0, 0, 0 };
 	vesa_fill(terminal_background);
 
+	// Serial connection
 	serial_install();
+	serial_print("\nConnected.\n");
+
+	// Install drivers
+	interrupts_install();
+	/* timer_install(); */
+	keyboard_install();
+
+	// Enable drivers
+	__asm__("sti");
+
+	mem_info++; // TODO: Use the mmap (or remove)!
 
 	ls_root();
 	gui_init(FONT_PATH);
 
-	gui_term_write("Welcome back, " USERNAME ".\n");
+	gui_term_write("Wake up, " USERNAME "...\n");
 
 	while (1) {
 	};
-- 
cgit v1.2.3