bootsplash: Don't pass mode flags to VBE get_mode_info call.

The spec doesn't specify one can pass flags into the get_mode_info
call, so don't do that.

Also, use the VBE_MODE_LINEAR_FRAME_BUFFER name where appropriate.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/bootsplash.c b/src/bootsplash.c
index a85e2b2ec4b8e22184155579c7801ac7b8b88e52..78023a59451cb8aaebd11f263f9ea3b4f2cafcea 100644 (file)
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -11,7 +11,8 @@
 #include "util.h" // dprintf
 #include "jpeg.h" // splash
 #include "vbe.h" // struct vbe_info
-#include "bmp.h"
+#include "bmp.h" // bmp_alloc
+
 
 /****************************************************************
  * Helper functions
@@ -63,7 +64,7 @@ find_videomode(struct vbe_info *vesa_info, struct vbe_mode_info *mode_info
         struct bregs br;
         memset(&br, 0, sizeof(br));
         br.ax = 0x4f01;
-        br.cx = (1 << 14) | videomode;
+        br.cx = videomode;
         br.di = FLATPTR_TO_OFFSET(mode_info);
         br.es = FLATPTR_TO_SEG(mode_info);
         call16_int10(&br);
@@ -216,7 +217,7 @@ enable_bootsplash(void)
     dprintf(5, "Switching to graphics mode\n");
     memset(&br, 0, sizeof(br));
     br.ax = 0x4f02;
-    br.bx = (1 << 14) | videomode;
+    br.bx = videomode | VBE_MODE_LINEAR_FRAME_BUFFER;
     call16_int10(&br);
     if (br.ax != 0x4f) {
         dprintf(1, "set_mode failed.\n");