aboutsummaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorMarvin Borner2021-03-12 19:11:26 +0100
committerMarvin Borner2021-03-12 19:11:26 +0100
commitbbf700a0c6b2f8ca9a73c2a334973286d5b8afcc (patch)
treec6d95e742da7b0ca0c95e5377840e888a579030f /kernel/main.c
parent0aef683b9d1e08555791426ba12223ed78051353 (diff)
Started basic ioctl fb interface
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 8247672..118fe11 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -2,6 +2,7 @@
#include <boot.h>
#include <cpu.h>
+#include <fb.h>
#include <fs.h>
#include <ide.h>
#include <interrupts.h>
@@ -17,10 +18,6 @@
#include <syscall.h>
#include <timer.h>
-#include <print.h>
-
-struct vid_info *boot_passed;
-
void kernel_main(struct mem_info *mem_info, struct vid_info *vid_info); // Decl
void kernel_main(struct mem_info *mem_info, struct vid_info *vid_info)
{
@@ -35,8 +32,6 @@ void kernel_main(struct mem_info *mem_info, struct vid_info *vid_info)
memory_install(mem_info);
- boot_passed = vid_info;
-
cpu_enable_features();
cpu_print();
srand(rdseed());
@@ -50,6 +45,7 @@ void kernel_main(struct mem_info *mem_info, struct vid_info *vid_info)
timer_install();
keyboard_install();
mouse_install();
+ fb_install(vid_info);
/* net_install(); */
// Enable drivers