Changeset 42260 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jul 20, 2012 1:22:19 PM (13 years ago)

Author:

vboxsync

Message:

BIOS: Do not try showing logo if VBE is not present.

File:

• trunk/src/VBox/Devices/PC/BIOS/logo.c (modified) (2 diffs)

trunk/src/VBox/Devices/PC/BIOS/logo.c

@@ -49 +49 @@
     "int    10h"            \
     parm [bx] modify [ax] nomemory;
+
+/**
+ * Get current VESA video mode.
+ * @params    New video mode.
+ */
+uint16_t vesa_get_mode(uint16_t __far *mode);
+#pragma aux vesa_get_mode = \
+    "mov    ax, 4F03h"      \
+    "int    10h"            \
+    "mov    es:[di], bx"    \
+    parm [es di] modify [ax] nomemory;
 
 
@@ -317 +328 @@
     uint8_t     is_fade_in, is_fade_out, uBootMenu;
     uint16_t    logo_time;
+    uint16_t    old_mode;
 
 
     // Set PIT to 1ms ticks
     wait_init();
-
 
     // Get main signature
     tmp = read_logo_word((uint8_t)&logo_hdr->u16Signature);
     if (tmp != 0x66BB)
+        goto done;
+
+    // If there is no VBE, just skip this
+    if (vesa_get_mode(&old_mode) != 0x004f )
         goto done;