diff options
| author | Miguel <m.i@gmx.at> | 2018-09-21 19:49:53 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-21 19:49:53 +0200 |
| commit | 1e5f3a249d4d389f6f7747c8f26aaf8e2988d930 (patch) | |
| tree | f3d81b0324d0a09595ad5737f8c167f8a7138686 /kernel | |
| parent | d7086073d9cc2d6f9174731bf8d8fb907d5d99e7 (diff) | |
struggling with UEFI
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernel.c | 4 | ||||
| -rw-r--r-- | kernel/multiboot.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index ab4332a..6bda4bf 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -63,7 +63,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) // -- GET CONFIGS -- // klog("Read Multiboot Structures ..."); multiboot_information *cfg_multiboot; - cfg_multiboot=multiboot_read(eax, ebx,true); // true-silent + cfg_multiboot=multiboot_read(eax, ebx,false); // true-silent // elf_multiboot_read(cfg_multiboot); // just show kernel section headers klog("Read Advanced Power Configuration Interface (ACPI) Structures ..."); @@ -117,7 +117,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) fixme("support binfonts spanning multiple blocks?"); uint32_t inode= ext2_filename_to_inode(VMEM_EXT2_RAMIMAGE,VESA_FONT_PATH); uint32_t addr= ext2_inode_blockstart( VMEM_EXT2_RAMIMAGE,inode,0); - vesa_init(cfg_multiboot->vbe_control_info,cfg_multiboot->vbe_mode_info,addr); + vesa_init(cfg_multiboot,addr); // -- STD STREAMS -- // fd_init_std_streams(0,cfg_multiboot->framebuffer_type!=2); diff --git a/kernel/multiboot.c b/kernel/multiboot.c index ce97c0a..dccd3ce 100644 --- a/kernel/multiboot.c +++ b/kernel/multiboot.c @@ -79,7 +79,7 @@ multiboot_information* multiboot_read(uint32_t eax, uint32_t ebx, bool silent) if(info->flags&&1<<12) { - klog("[12] Framebuffer (type=%d) (w:%d h:%d bpp:%d) at addr=0x%08X",info->framebuffer_type,info->framebuffer_width,info->framebuffer_height,info->framebuffer_bpp,info->framebuffer_addr); + klog("[12] Framebuffer (type=%d) (w:%d h:%d bpp:%d) (pitch: %d) at addr=0x%08X",info->framebuffer_type,info->framebuffer_width,info->framebuffer_height,info->framebuffer_bpp,info->framebuffer_pitch,info->framebuffer_addr); } return info; |