summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 4ba76fa..e52c490 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -54,9 +54,6 @@ void kernel_main(uint32_t eax,uint32_t ebx)
// MULTIBOOT HEADER
multiboot_information *info=get_multiboot(eax, ebx);
- // INIT VESA
- vesa_init(info->vbe_control_info,info->vbe_mode_info,0);
-
// Gather Info about other processors. (APs = application processors) // ACPI or MP
smp_processors procdata;
@@ -81,6 +78,12 @@ void kernel_main(uint32_t eax,uint32_t ebx)
// PCI Bus
pci_init();
+ // INIT VESA
+ uint32_t addr=kballoc(1);
+ fs_content("/binfont.bin",addr,0x100); // copy 0x100 bytes to 0x7000
+ vesa_init(info->vbe_control_info,info->vbe_mode_info,addr);
+ PutString("WELCOME TO THE Fool Operating System",100,100,0xffff00);
+
// INIT MULTITASKING (and switch to usermode)
task_init(dir);