summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-08-19 03:15:50 +0200
committerMiguel <m.i@gmx.at>2018-08-19 03:15:50 +0200
commit9b13ca03dacb6a385461dccad319010537add5cf (patch)
tree4397fdff0d1566b7bec761031ce2077e88cd5379 /kernel/kernel.c
parenta2bd733e517364b6c9ddd26706d85fac09656854 (diff)
get vesa working in vmem.
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index fcfb8d7..4ba76fa 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -53,6 +53,9 @@ 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;
@@ -71,9 +74,9 @@ void kernel_main(uint32_t eax,uint32_t ebx)
//TODO: !!! Check commented out sleep ()!!!
smp_log_procdata(&procdata);
smp_start_aps(&procdata,"/boot/mp.bin"); //will be copied over mbr
-
+
// VIRTUAL MEMORY (paging)
- pdirectory *dir=vmem_init(kernel_blocks);
+ pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)info->framebuffer_addr);
// PCI Bus
pci_init();