Changeset 7dfc120a in mainline

Timestamp:

2009-03-18T15:23:03Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1496f87

Parents:

e749794

Message:

check for proper VESA mode attributes

File:

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

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

@@ -164 +164 @@
                 mov %gs:(%si), %cx
                 cmp $VESA_END_OF_MODES, %cx
-                jz no_mode
+                je no_mode
                 
                 inc %si
@@ -178 +178 @@
                 pop %cx
                 cmp $VESA_OK, %al
-                jnz no_mode
+                jne no_mode
+                
+                # check for proper attributes (supported, color, graphics, liner framebuffer)
+                
+                mov VESA_MODE_ATTRIBUTES_OFFSET(%di), %ax
+                and $0x99, %ax
+                cmp $0x99, %ax
+                jne next_mode
+                
+                # check for proper resolution
                 
                 mov default_width - vesa_init, %ax
                 cmp VESA_MODE_WIDTH_OFFSET(%di), %ax
-                jnz next_mode
+                jne next_mode
                 
                 mov default_height - vesa_init, %ax
                 cmp VESA_MODE_HEIGHT_OFFSET(%di), %ax
-                jnz next_mode
+                jne next_mode
+                
+                # check for proper bpp
                 
                 mov default_bpp - vesa_init, %al
                 cmp VESA_MODE_BPP_OFFSET(%di), %al
-                jz set_mode
+                je set_mode
                 
                 mov $24, %al
                 cmp default_bpp - vesa_init, %al
-                jnz next_mode
+                jne next_mode
                 
                 # for 24 bpp modes accept also 32 bit bpp
@@ -200 +211 @@
                 mov $32, %al
                 cmp VESA_MODE_BPP_OFFSET(%di), %al
-                jnz next_mode
+                jne next_mode
         
         set_mode: