Changeset 8781e9d in mainline

Timestamp:

2018-11-12T20:20:36Z (6 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.

Files:

• kernel/arch/amd64/src/boot/multiboot.S (modified) (7 diffs)
• kernel/arch/amd64/src/boot/vesa_prot.inc (deleted)
• kernel/arch/amd64/src/boot/vesa_real.inc (deleted)
• kernel/arch/amd64/src/boot/vesa_ret.inc (deleted)
• kernel/arch/amd64/src/boot/vga323.pal (deleted)
• kernel/arch/ia32/src/boot/multiboot.S (modified) (7 diffs)
• kernel/arch/ia32/src/boot/vesa_prot.inc (deleted)
• kernel/arch/ia32/src/boot/vesa_real.inc (deleted)
• kernel/arch/ia32/src/boot/vesa_ret.inc (deleted)
• kernel/arch/ia32/src/boot/vga323.pal (deleted)
• kernel/genarch/include/genarch/multiboot/multiboot.h (modified) (1 diff)
• kernel/genarch/include/genarch/multiboot/multiboot_info_struct.h (modified) (2 diffs)
• kernel/genarch/src/multiboot/multiboot.c (modified) (2 diffs)
• tools/autocheck.awk (modified) (1 diff)

kernel/arch/amd64/src/boot/multiboot.S

@@ -38 +38 @@
 #include <arch/cpu.h>
 
+// TODO: most of this file can be rewritten in C
+
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
 
@@ -50 +52 @@
 
 .macro pm_status msg
-#ifdef CONFIG_EGA
+#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
         pushl %esi
         movl \msg, %esi
@@ -67 +69 @@
 multiboot_header:
         .long MULTIBOOT_HEADER_MAGIC
+#ifdef CONFIG_FB
         .long MULTIBOOT_HEADER_FLAGS
         .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
+#else
+        .long MULTIBOOT_HEADER_FLAGS_NOFB
+        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
+#endif
         .long multiboot_header
         .long unmapped_start
@@ -74 +81 @@
         .long 0
         .long multiboot_image_start
+#ifdef CONFIG_FB
+        .long 0
+        .long CONFIG_BFB_WIDTH
+        .long CONFIG_BFB_HEIGHT
+        .long CONFIG_BFB_BPP
+#endif
 
 SYMBOL(multiboot_image_start)
@@ -158 +171 @@
         sse2_supported:
 
-#include "vesa_prot.inc"
-
         pm2_status $status_prot2
 
@@ -568 +579 @@
 
         ret
-
-#include "vesa_real.inc"
 
 .section K_INI_PTLS, "aw", @progbits
@@ -708 +717 @@
 status_prot:
         .asciz "[prot] "
-status_vesa_copy:
-        .asciz "[vesa_copy] "
 status_multiboot_cmdline:
         .asciz "[multiboot_cmdline] "
-status_vesa_real:
-        .asciz "[vesa_real] "
 status_prot2:
         .asciz "[prot2] "

kernel/arch/ia32/src/boot/multiboot.S

@@ -38 +38 @@
 #include <arch/cpu.h>
 
+// TODO: most of this file can be rewritten in C
+
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
 
@@ -50 +52 @@
 
 .macro pm_status msg
-#ifdef CONFIG_EGA
+#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
         pushl %esi
         movl \msg, %esi
@@ -66 +68 @@
 multiboot_header:
         .long MULTIBOOT_HEADER_MAGIC
+#ifdef CONFIG_FB
         .long MULTIBOOT_HEADER_FLAGS
         .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
+#else
+        .long MULTIBOOT_HEADER_FLAGS_NOFB
+        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
+#endif
         .long multiboot_header
         .long unmapped_start
@@ -73 +80 @@
         .long 0
         .long multiboot_image_start
+#ifdef CONFIG_FB
+        .long 0
+        .long CONFIG_BFB_WIDTH
+        .long CONFIG_BFB_HEIGHT
+        .long CONFIG_BFB_BPP
+#endif
 
 SYMBOL(multiboot_image_start)
@@ -104 +117 @@
 
         pm_status $status_prot
-
-#include "vesa_prot.inc"
 
 #ifndef PROCESSOR_i486
@@ -685 +696 @@
         ret
 
-#include "vesa_real.inc"
-
 .section K_DATA_START, "aw", @progbits
 
@@ -720 +729 @@
 status_non_pse:
         .asciz "[non_pse] "
-status_vesa_copy:
-        .asciz "[vesa_copy] "
 status_multiboot_cmdline:
         .asciz "[multiboot_cmdline] "
-status_vesa_real:
-        .asciz "[vesa_real] "
 status_prot2:
         .asciz "[prot2] "

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__

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

@@ -30 +30 @@
 #define KERN_MULTIBOOT_INFO_STRUCT_H_
 
-#define MULTIBOOT_INFO_OFFSET_FLAGS        0x00
-#define MULTIBOOT_INFO_OFFSET_MEM_LOWER    0x04
-#define MULTIBOOT_INFO_OFFSET_MEM_UPPER    0x08
-#define MULTIBOOT_INFO_OFFSET_BOOT_DEVICE  0x0c
-#define MULTIBOOT_INFO_OFFSET_CMD_LINE     0x10
-#define MULTIBOOT_INFO_OFFSET_MODS_COUNT   0x14
-#define MULTIBOOT_INFO_OFFSET_MODS_ADDR    0x18
-#define MULTIBOOT_INFO_OFFSET_SYMS         0x1c
-#define MULTIBOOT_INFO_OFFSET_MMAP_LENGTH  0x2c
-#define MULTIBOOT_INFO_OFFSET_MMAP_ADDR    0x30
-#define MULTIBOOT_INFO_SIZE                0x34
+#define MULTIBOOT_INFO_OFFSET_FLAGS               0x00
+#define MULTIBOOT_INFO_OFFSET_MEM_LOWER           0x04
+#define MULTIBOOT_INFO_OFFSET_MEM_UPPER           0x08
+#define MULTIBOOT_INFO_OFFSET_BOOT_DEVICE         0x0c
+#define MULTIBOOT_INFO_OFFSET_CMD_LINE            0x10
+#define MULTIBOOT_INFO_OFFSET_MODS_COUNT          0x14
+#define MULTIBOOT_INFO_OFFSET_MODS_ADDR           0x18
+#define MULTIBOOT_INFO_OFFSET_SYMS                0x1c
+#define MULTIBOOT_INFO_OFFSET_MMAP_LENGTH         0x2c
+#define MULTIBOOT_INFO_OFFSET_MMAP_ADDR           0x30
+#define MULTIBOOT_INFO_OFFSET_DRIVES_LENGTH       0x34
+#define MULTIBOOT_INFO_OFFSET_DRIVES_ADDR         0x38
+#define MULTIBOOT_INFO_OFFSET_CONFIG_TABLE        0x3c
+#define MULTIBOOT_INFO_OFFSET_BOOT_LOADER_NAME    0x40
+#define MULTIBOOT_INFO_OFFSET_APM_TABLE           0x44
+#define MULTIBOOT_INFO_OFFSET_VBE_CONTROL_INFO    0x48
+#define MULTIBOOT_INFO_OFFSET_VBE_MODE_INFO       0x4c
+#define MULTIBOOT_INFO_OFFSET_VBE_MODE            0x50
+#define MULTIBOOT_INFO_OFFSET_VBE_INTERFACE_SEG   0x52
+#define MULTIBOOT_INFO_OFFSET_VBE_INTERFACE_OFF   0x54
+#define MULTIBOOT_INFO_OFFSET_VBE_INTERFACE_LEN   0x56
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_ADDR    0x58
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_PITCH   0x60
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_WIDTH   0x64
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_HEIGHT  0x68
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_BPP     0x6c
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_TYPE    0x6d
+
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_PALETTE_ADDR          0x6e
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_PALETTE_NUM_COLORS    0x72
+
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_RED_FIELD_POSITION    0x6e
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_RED_MASK_SIZE         0x6f
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_GREEN_FIELD_POSITION  0x70
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_GREEN_MASK_SIZE       0x71
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_BLUE_FIELD_POSITION   0x72
+#define MULTIBOOT_INFO_OFFSET_FRAMEBUFFER_BLUE_MASK_SIZE        0x73
+
+#define MULTIBOOT_INFO_SIZE                0x76
 
 #ifndef __ASSEMBLER__
@@ -57 +85 @@
         uint32_t mmap_length;
         uint32_t mmap_addr;
+        uint32_t drives_length;
+        uint32_t drives_addr;
+        uint32_t config_table;
+        uint32_t boot_loader_name;
+        uint32_t apm_table;
+        uint32_t vbe_control_info;
+        uint32_t vbe_mode_info;
+        uint16_t vbe_mode;
+        uint16_t vbe_interface_seg;
+        uint16_t vbe_interface_off;
+        uint16_t vbe_interface_len;
+        uint64_t framebuffer_addr;
+        uint32_t framebuffer_pitch;
+        uint32_t framebuffer_width;
+        uint32_t framebuffer_height;
+        uint8_t framebuffer_bpp;
+        uint8_t framebuffer_type;
+        union {
+                struct {
+                        uint32_t framebuffer_palette_addr;
+                        uint32_t framebuffer_palette_num_colors;
+                } __attribute__((packed));
+                struct {
+                        uint8_t framebuffer_red_field_position;
+                        uint8_t framebuffer_red_mask_size;
+                        uint8_t framebuffer_green_field_position;
+                        uint8_t framebuffer_green_mask_size;
+                        uint8_t framebuffer_blue_field_position;
+                        uint8_t framebuffer_blue_mask_size;
+                } __attribute__((packed));
+        } __attribute__((packed));
 } __attribute__((packed)) multiboot_info_t;
 

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
 }
 

tools/autocheck.awk

@@ -38 +38 @@
 
 /}.*;/ {
-        pattern = "}( __attribute__\\(.*\\))? (" struct_name "_t)?;"
-        if ($0 !~ pattern) {
-                print("Bad struct ending: " $0) > "/dev/stderr"
-                exit 1
+        pattern = "}( __attribute__\\(.*\\))? " struct_name "_t;"
+        if ($0 ~ pattern) {
+                macro_name = toupper(struct_name) "_SIZE"
+                print "_Static_assert(" macro_name " == sizeof(struct " struct_name "), \"\");"
+                struct_name = ""
         }
-        macro_name = toupper(struct_name) "_SIZE"
-        print "_Static_assert(" macro_name " == sizeof(struct " struct_name "), \"\");"
-        struct_name = ""
 }
 
 /;$/ {
-        if (struct_name != "") {
+        if (struct_name != "" && $0 !~ "}") {
                 # Remove array subscript, if any.
                 sub("(\\[.*\\])?;", "", $0)