Changes in kernel/arch/ia32/src/boot/vesa_real.inc [cf155ed:c427578] in mainline

File:

• kernel/arch/ia32/src/boot/vesa_real.inc (modified) (5 diffs)

kernel/arch/ia32/src/boot/vesa_real.inc

@@ -154 +154 @@
         mov $e_vesa_init - vesa_init, %di
         push %di
-        /* Write the "VBE2" signature into the info structure in order
-         * to get proper mode information. The presence of "VBE2"
-         * indicates two things:
-         *
-         *  - VBE controller information structure is expected to be
-         *    512 bytes long instead of 256 bytes.
-         *  - The BIOS should report VBE 3.0 information (potentially
-         *    including non-standard modes in the mode list).
+        /* Write "VBE2" signature to info structure in order to get
+         * proper mode information. The presence of "VBE2" indicates two
+         * things:
+         *  - VBE controller information structure is 512 bytes long
+         *    instead of 256
+         *  - The BIOS reports VBE 3.0 information (including non-standard
+         *    modes in mode list)
          */
         movl $0x32454256, (%di)
@@ -304 +303 @@
                 /*
                  * Store mode parameters:
-                 *  eax = bpp[16] scanline[16]
+                 *  eax = bpp[8] scanline[16]
                  *  ebx = width[16]  height[16]
                  *  edx = red_mask[8] red_pos[8] green_mask[8] green_pos[8]
@@ -328 +327 @@
                 shl $8, %edx
                 mov VESA_MODE_RED_POS_OFFSET(%di), %dl
-                
                 shl $8, %edx
                 mov VESA_MODE_GREEN_MASK_OFFSET(%di), %dl
@@ -370 +368 @@
                 mov $0x0003, %ax
                 int $0x10
-                
-                xor %eax, %eax
-                xor %ebx, %ebx
-                xor %edx, %edx
-                xor %edi, %edi
-                
+                mov $0xffffffff, %edi
+                xor %ax, %ax
                 jz vesa_leave_real  /* force relative jump */
 
@@ -391 +385 @@
 
 default_mode:
-        .ascii STRING(CONFIG_BFB_MODE)
+        .ascii STRING(CONFIG_VESA_MODE)
         .ascii "-"
-        .asciz STRING(CONFIG_BFB_BPP)
+        .asciz STRING(CONFIG_VESA_BPP)
         .fill 24