Changeset 4c89b09 in mainline

Timestamp:

2006-05-05T14:20:01Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

e8194664

Parents:

203dcd45

Message:

VESA detection failure fix on amd64

File:

• arch/amd64/src/boot/boot.S (modified) (1 diff)

arch/amd64/src/boot/boot.S

@@ -422 +422 @@
         ljmpl $gdtselector(KTEXT32_DES),$(vesa_init_protect-vesa_init+VESA_INIT_SEGMENT<<4);
 
+
+0:#Error no Prefered mode found
+  mov $0x111,%cx;
+  push %di;
+  push %cx;
+  mov $VESA_GET_MODE_INFO,%ax;
+  int $0x10;
+  pop %cx;
+  pop %di;
+  cmp $VESA_OK,%al;
+  jnz 1f;
+  jz 2b;    /* Force relative jump */
+
+                                                                                                                                                                                                                                                                        
+1:mov $0x0003,%ax;
+  int $0x10;
+  mov $0xffffffff,%edi; /* EGA text mode used, because of problems with VESA */
+  xor %ax,%ax
+  jz 8b;    /* Force relative jump */
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+
 vesa_init_protect:      
 .code32
         ret;
-
-0:      #Error no Prefered mode found
-
-        mov $0x111,%cx;
-        push %di;
-        push %cx;
-        mov $VESA_GET_MODE_INFO,%ax;
-        int $0x10;
-        pop %cx;
-        pop %di;
-        cmp $VESA_OK,%al;
-        jnz 1f;
-        jmp 2b;
-
-1:mov $0x0003,%ax;
-        int $0x10;
-        mov $0xffffffff,%edi; /* EGA text mode used, because of problems with VESA */
-        jmp 8;