From c102a9cd6c1da22f0c928fc66bd4bf0b5750765a Mon Sep 17 00:00:00 2001 From: Miguel Date: Sun, 19 Aug 2018 03:33:06 +0200 Subject: foolos fonts work again! --- kernel/kernel.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'kernel/kernel.c') 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); -- cgit v1.2.3