Changes in kernel/arch/ia32/src/boot/vesa_prot.inc [1f5c9c96:873c681] in mainline

File:

• kernel/arch/ia32/src/boot/vesa_prot.inc (modified) (3 diffs)

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

@@ -1 +1 @@
 #ifdef CONFIG_FB
 
+#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
 #define MBINFO_BIT_CMDLINE      2
 #define MBINFO_OFFSET_CMDLINE   16
@@ -13 +14 @@
         rep movsb
         
-        /* Check for multiboot command line */
+        /* Check for GRUB command line */
         
-        pm_status $status_multiboot_cmdline
+        pm_status $status_grub_cmdline
         
-        mov multiboot_eax, %eax
+        mov grub_eax, %eax
         cmp $MULTIBOOT_LOADER_MAGIC, %eax
         jne no_cmdline
         
-        mov multiboot_ebx, %ebx
+        mov grub_ebx, %ebx
         mov (%ebx), %eax
         bt $MBINFO_BIT_CMDLINE, %eax
@@ -88 +89 @@
                 /* Returned back to protected mode */
                 
-                movzx %ax, %ecx
-                mov %ecx, KA2PA(bfb_scanline)
+                mov %ax, KA2PA(vesa_scanline)
+                shr $16, %eax
+                mov %ax, KA2PA(vesa_bpp)
                 
-                shr $16, %eax
-                mov %ax, KA2PA(bfb_bpp)
+                mov %bx, KA2PA(vesa_height)
+                shr $16, %ebx
+                mov %bx, KA2PA(vesa_width)
                 
-                movzx %bx, %ecx
-                mov %ecx, KA2PA(bfb_height)
-                
-                shr $16, %ebx
-                mov %ebx, KA2PA(bfb_width)
-                
-                mov %dl, KA2PA(bfb_green_pos)
-                
+                mov %dl, KA2PA(vesa_green_pos)
                 shr $8, %edx
-                mov %dl, KA2PA(bfb_green_size)
-                
+                mov %dl, KA2PA(vesa_green_mask)
                 shr $8, %edx
-                mov %dl, KA2PA(bfb_red_pos)
-                
+                mov %dl, KA2PA(vesa_red_pos)
                 shr $8, %edx
-                mov %dl, KA2PA(bfb_red_size)
+                mov %dl, KA2PA(vesa_red_mask)
                 
                 mov %esi, %edx
-                mov %dl, KA2PA(bfb_blue_pos)
+                mov %dl, KA2PA(vesa_blue_pos)
+                shr $8, %edx
+                mov %dl, KA2PA(vesa_blue_mask)
                 
-                shr $8, %edx
-                mov %dl, KA2PA(bfb_blue_size)
-                
-                mov %edi, KA2PA(bfb_addr)
+                mov %edi, KA2PA(vesa_ph_addr)
 #endif