Changeset 8781e9d in mainline for kernel/genarch/src/multiboot/multiboot.c

Timestamp:

2018-11-12T20:20:36Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

08f1a6d

Parents:

15639ec

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 20:09:40)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 20:20:36)

Message:

Remove realmode VESA code

This simply enables framebuffer setup via multiboot1
(multiboot2 already did it), and removes the obsolete code.

File:

• kernel/genarch/src/multiboot/multiboot.c (modified) (2 diffs)

kernel/genarch/src/multiboot/multiboot.c

@@ -35 +35 @@
 #include <typedefs.h>
 #include <genarch/multiboot/multiboot.h>
+#include <genarch/fb/bfb.h>
 #include <config.h>
 #include <stddef.h>
@@ -168 +169 @@
                 multiboot_memmap(info->mmap_length,
                     (multiboot_memmap_t *) MULTIBOOT_PTR(info->mmap_addr));
+
+#ifdef CONFIG_FB
+
+        /* Initialize framebuffer. */
+        if ((info->flags & MULTIBOOT_INFO_FLAGS_FB) != 0) {
+                if (info->framebuffer_type != 1) {
+                        /* Can't use this framebuffer. */
+                        // FIXME: framebuffer_type == 2 is EGA mode, we should be able to use that.
+                        return;
+                }
+
+                bfb_addr = info->framebuffer_addr;
+                bfb_width = info->framebuffer_width;
+                bfb_height = info->framebuffer_height;
+                bfb_bpp = info->framebuffer_bpp;
+                bfb_scanline = info->framebuffer_pitch;
+                bfb_red_pos = info->framebuffer_red_field_position;
+                bfb_red_size = info->framebuffer_red_mask_size;
+                bfb_green_pos = info->framebuffer_green_field_position;
+                bfb_green_size = info->framebuffer_green_mask_size;
+                bfb_blue_pos = info->framebuffer_blue_field_position;
+                bfb_blue_size = info->framebuffer_blue_mask_size;
+        }
+
+#endif
 }