From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 15:16:55 +0000 (+0100)
Subject: merge mainline into mbivid
X-Git-Tag: 1.99~460^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77d29bee568673361b7a7ad4b2470736855739de;p=thirdparty%2Fgrub.git

merge mainline into mbivid
---

77d29bee568673361b7a7ad4b2470736855739de
diff --cc ChangeLog.mbivid
index da4fa3c88,000000000..4720581be
mode 100644,000000..100644
--- a/ChangeLog.mbivid
+++ b/ChangeLog.mbivid
@@@ -1,24 -1,0 +1,20 @@@
 +2010-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	Video multiboot support.
 +
 +	* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
 +	New prototype.
- 	* include/grub/video.h (grub_video_driver_id): New type.
- 	(grub_video_adapter): New member 'id'. All users updated.
- 	(grub_video_get_driver_id): New proto.
 +	* include/multiboot.h: Resynced with multiboot specification.
 +	* include/multiboot2.h: Likewise.
 +	* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
 +	(grub_multiboot): Parse MULTIBOOT_VIDEO_MODE fields.
 +	* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): New constant.
 +	(HAS_VGA_TEXT): Likewise.
 +	(HAS_VBE): Likewise.
 +	(accepts_video): New variable.
 +	(grub_multiboot_set_accepts_video): New function.
 +	(grub_multiboot_get_mbi_size): Account for video structures.
 +	(set_video_mode): New function.
 +	(fill_vbe_info) [HAS_VBE]: Likewise.
 +	(retrieve_video_parameters): Likewise.
 +	(grub_multiboot_make_mbi): Fill video fields.
- 	* video/video.c (grub_video_get_driver_id): New function.