From e11298e56be560de64bbccfe74fef7ff85c623d1 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Mon, 8 Aug 2022 21:25:55 +0200 Subject: stdio.h; gcc $(WARNINGS) --- kernel/src/boot/multiboot2.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'kernel/src/boot') diff --git a/kernel/src/boot/multiboot2.c b/kernel/src/boot/multiboot2.c index fd8a652..75a1f8d 100644 --- a/kernel/src/boot/multiboot2.c +++ b/kernel/src/boot/multiboot2.c @@ -1,14 +1,11 @@ #include - #include + #include #include - #define KERNEL_VMA 0xc0000000 -fb_t fb; - /* https://www.gnu.org/software/grub/manual/multiboot2/html_node/Boot-information-format.html */ void init_fb(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic) @@ -39,9 +36,9 @@ void init_fb(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic) tag_header += tag_header->size / 8 + ((tag_header->size % 8) > 0); } - fb.addr = tag_fb->framebuffer_addr; - fb.width = tag_fb->framebuffer_width; - fb.height = tag_fb->framebuffer_height; - fb.pitch = tag_fb->framebuffer_pitch; - fb.bpp = tag_fb->framebuffer_bpp; + main_fb.addr = tag_fb->framebuffer_addr; + main_fb.width = tag_fb->framebuffer_width; + main_fb.height = tag_fb->framebuffer_height; + main_fb.pitch = tag_fb->framebuffer_pitch; + main_fb.bpp = tag_fb->framebuffer_bpp; } -- cgit v1.2.3