Changes in kernel/arch/ia32/src/boot/vesa_real.inc [c427578:cf155ed] 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 "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)
+        /* 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).
          */
         movl $0x32454256, (%di)
@@ -303 +304 @@
                 /*
                  * Store mode parameters:
-                 *  eax = bpp[8] scanline[16]
+                 *  eax = bpp[16] scanline[16]
                  *  ebx = width[16]  height[16]
                  *  edx = red_mask[8] red_pos[8] green_mask[8] green_pos[8]
@@ -327 +328 @@
                 shl $8, %edx
                 mov VESA_MODE_RED_POS_OFFSET(%di), %dl
+                
                 shl $8, %edx
                 mov VESA_MODE_GREEN_MASK_OFFSET(%di), %dl
@@ -368 +370 @@
                 mov $0x0003, %ax
                 int $0x10
-                mov $0xffffffff, %edi
-                xor %ax, %ax
+                
+                xor %eax, %eax
+                xor %ebx, %ebx
+                xor %edx, %edx
+                xor %edi, %edi
+                
                 jz vesa_leave_real  /* force relative jump */
 
@@ -385 +391 @@
 
 default_mode:
-        .ascii STRING(CONFIG_VESA_MODE)
+        .ascii STRING(CONFIG_BFB_MODE)
         .ascii "-"
-        .asciz STRING(CONFIG_VESA_BPP)
+        .asciz STRING(CONFIG_BFB_BPP)
         .fill 24