aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-10-27 13:07:06 +0100
committerMarvin Borner2019-10-27 13:07:06 +0100
commit654934e0b5e5ef08e6fd337d5ceb864289796c66 (patch)
tree75bb34443cda750c1f5e26d7d6e500b73963e1ae /src/kernel/kernel.c
parent52503f9b654f68f11dea676e9636c2004176ef29 (diff)
Improved boot process and color scheme
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index b6f0591..172ef55 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -9,12 +9,12 @@
void init() {
timer_install();
gdt_install();
+ init_serial();
paging_install();
keyboard_install();
idt_install();
isrs_install();
irq_install();
- init_serial();
set_optimal_resolution();
asm volatile ("sti");
}
@@ -22,15 +22,6 @@ void init() {
void kernel_main(void) {
init();
- vesa_draw_string("This is a testing text!");
-
- if (vesa_available) {
- serial_write("Loaded VESA!\n");
- } else {
- serial_write("VESA loading failed!\n");
- switch_to_vga();
- }
-
// __asm__ ("div %0" :: "r"(0)); // Exception testing x/0
loop:
asm volatile ("hlt");