2010-01-18 Robert Millan <rmh.grub@aybabtu.com>

	* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
	(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this.  Update all users.
	(GRUB_VIDEO_TYPE_VLFB): Rename to ...
	(GRUB_VIDEO_LINUX_TYPE_VESA): ... this.  Update all users.
	(GRUB_VIDEO_TYPE_EFI): Rename to ...
	(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this.  Update all users.

diff --git a/ChangeLog b/ChangeLog
index 9ef3d3d42d01f244add01a33c7c2d7b032e960f3..a53cf92792a8b7539b497be92791cd844ab2117c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
+       (GRUB_VIDEO_LINUX_TYPE_TEXT): ... this.  Update all users.
+       (GRUB_VIDEO_TYPE_VLFB): Rename to ...
+       (GRUB_VIDEO_LINUX_TYPE_VESA): ... this.  Update all users.
+       (GRUB_VIDEO_TYPE_EFI): Rename to ...
+       (GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this.  Update all users.
+
 2010-01-17  Robert Millan  <rmh.grub@aybabtu.com>
 
        * include/grub/test.h: Add license header.

diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index 8a5a84da3122e1f814b2addfb60a7625d8cc3ddc..f02a722d66e41fd7355813f8f58c3b7180302e1d 100644 (file)
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -79,9 +79,9 @@ struct grub_e820_mmap
   grub_uint32_t type;
 } __attribute__((packed));
 
-#define GRUB_VIDEO_TYPE_TEXT   0x01
-#define GRUB_VIDEO_TYPE_VLFB   0x23    /* VESA VGA in graphic mode     */
-#define GRUB_VIDEO_TYPE_EFI    0x70
+#define GRUB_VIDEO_LINUX_TYPE_TEXT     0x01
+#define GRUB_VIDEO_LINUX_TYPE_VESA     0x23    /* VESA VGA in graphic mode.  */
+#define GRUB_VIDEO_LINUX_TYPE_SIMPLE   0x70    /* Linear framebuffer without any additional functions.  */
 
 /* For the Linux/i386 boot protocol version 2.03.  */
 struct linux_kernel_header

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 1abcc06dbcf0fcc0df6c99b3074d56b758be4e3c..2e26f392926cc85bbc8a168085eed90a65172d32 100644 (file)
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -587,7 +587,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
   params->reserved_mask_size = 8;
   params->reserved_field_pos = 24;
 
-  params->have_vga = GRUB_VIDEO_TYPE_VLFB;
+  params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
   params->vid_mode = 0x338;  /* 1024x768x32  */
 
   return 0;
@@ -852,7 +852,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     else if (grub_memcmp (argv[i], "video=efifb", 11) == 0)
       {
        if (params->have_vga)
-         params->have_vga = GRUB_VIDEO_TYPE_EFI;
+         params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
       }
 
   /* Specify the boot file.  */

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 7712bf2bfc77f555f9f5ceea2e0d7f5d1b1d5cf6..a81e841359a6795cd044724a0821ee31ea46f2e0 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -538,16 +538,16 @@ grub_linux_boot (void)
     }
 
   if (! grub_linux_setup_video (params))
-    params->have_vga = GRUB_VIDEO_TYPE_VLFB;
+    params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
   else
     {
-      params->have_vga = GRUB_VIDEO_TYPE_TEXT;
+      params->have_vga = GRUB_VIDEO_LINUX_TYPE_TEXT;
       params->video_width = 80;
       params->video_height = 25;
     }
 
   /* Initialize these last, because terminal position could be affected by printfs above.  */
-  if (params->have_vga == GRUB_VIDEO_TYPE_TEXT)
+  if (params->have_vga == GRUB_VIDEO_LINUX_TYPE_TEXT)
     {
       grub_term_output_t term;
       int found = 0;