Changes in kernel/arch/ia32/src/boot/vesa_real.inc [36aec61e:8be3230] in mainline

File:

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

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

@@ -21 +21 @@
 #define VESA_END_OF_MODES  0xffff
 
-#define VESA_OK  0x004f
+#define VESA_OK  0x4f
 
 #define VESA_GET_INFO       0x4f00
@@ -180 +180 @@
 
         pop %di
-        cmp $VESA_OK, %ax
+        cmp $VESA_OK, %al
         jnz no_mode
 
@@ -207 +207 @@
                 pop %di
                 pop %cx
-                cmp $VESA_OK, %ax
+                cmp $VESA_OK, %al
                 jne no_mode
 
@@ -254 +254 @@
 
                 pop %di
-                cmp $VESA_OK, %ax
+                cmp $VESA_OK, %al
                 jnz no_mode
 
@@ -364 +364 @@
 
                 /* No prefered mode found */
-                push %di
-                mov $e_vesa_init - vesa_init, %di
-                mov 2 + VESA_MODE_LIST_PTR_OFFSET(%di), %si
-                mov %si, %gs
-                mov VESA_MODE_LIST_PTR_OFFSET(%di), %si
-                pop %di
-
-                /* Check if list of supported modes contains fallback mode */
-        find_fallback_mode:
-
-                mov %gs:(%si), %cx
-
-                cmp $0x111, %cx
-                je fallback_mode_listed
-
-                cmp $VESA_END_OF_MODES, %cx
-                je text_mode
-
-                inc %si
-                inc %si
-                jmp find_fallback_mode /* 16-bit relative jump */
-
-        fallback_mode_listed:
-                /* Make sure fallback mode is really supported */
+
                 mov $0x111, %cx
                 push %di
@@ -396 +373 @@
                 pop %cx
                 pop %di
-                cmp $VESA_OK, %ax
+                cmp $VESA_OK, %al
                 jnz text_mode
-
-                /* Verify mode attributes */
-                and $0x99, %ax
-                cmp $0x99, %ax
-                jne text_mode
-
-                jmp set_mode  /* 16-bit relative jump */
+                jz set_mode  /* force relative jump */
 
         text_mode: