Changeset 6843a9c in mainline for kernel/arch/ia32/src/boot/vesa_real.inc

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

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

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

@@ -304 +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]
@@ -328 +328 @@
                 shl $8, %edx
                 mov VESA_MODE_RED_POS_OFFSET(%di), %dl
+                
                 shl $8, %edx
                 mov VESA_MODE_GREEN_MASK_OFFSET(%di), %dl
@@ -369 +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 */
 
@@ -386 +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