Changeset 8781e9d in mainline for kernel/genarch/include/genarch/multiboot/multiboot.h

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/include/genarch/multiboot/multiboot.h (modified) (1 diff)

kernel/genarch/include/genarch/multiboot/multiboot.h

@@ -39 +39 @@
 #include <genarch/multiboot/multiboot_info_struct.h>
 
-#define MULTIBOOT_HEADER_MAGIC  0x1badb002
-#define MULTIBOOT_HEADER_FLAGS  0x00010003
+#define MULTIBOOT_HEADER_MAGIC       0x1badb002
+#define MULTIBOOT_HEADER_FLAGS       0x00010007
+#define MULTIBOOT_HEADER_FLAGS_NOFB  0x00010003
 
 #define MULTIBOOT_LOADER_MAGIC  0x2badb002
 
-#define MULTIBOOT_INFO_FLAGS_MEM        0x01
-#define MULTIBOOT_INFO_FLAGS_BOOT       0x02
-#define MULTIBOOT_INFO_FLAGS_CMDLINE    0x04
-#define MULTIBOOT_INFO_FLAGS_MODS       0x08
-#define MULTIBOOT_INFO_FLAGS_SYMS1      0x10
-#define MULTIBOOT_INFO_FLAGS_SYMS2      0x20
-#define MULTIBOOT_INFO_FLAGS_MMAP       0x40
+#define MULTIBOOT_INFO_FLAGS_MEM               0x0001
+#define MULTIBOOT_INFO_FLAGS_BOOT              0x0002
+#define MULTIBOOT_INFO_FLAGS_CMDLINE           0x0004
+#define MULTIBOOT_INFO_FLAGS_MODS              0x0008
+#define MULTIBOOT_INFO_FLAGS_SYMS_AOUT         0x0010
+#define MULTIBOOT_INFO_FLAGS_SYMS_ELF          0x0020
+#define MULTIBOOT_INFO_FLAGS_MMAP              0x0040
+#define MULTIBOOT_INFO_FLAGS_DRIVES            0x0080
+#define MULTIBOOT_INFO_FLAGS_CONFIG_TABLE      0x0100
+#define MULTIBOOT_INFO_FLAGS_BOOT_LOADER_NAME  0x0200
+#define MULTIBOOT_INFO_FLAGS_APM               0x0400
+#define MULTIBOOT_INFO_FLAGS_VBE               0x0800
+#define MULTIBOOT_INFO_FLAGS_FB                0x1000
 
 #ifndef __ASSEMBLER__