merge mainline into mbivid

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-15 16:42:06 +01:00
commit 15556fef6e
2 changed files with 25 additions and 17 deletions

View file

@ -1,3 +1,22 @@
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video multiboot support.
* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
New prototype.
* 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.
(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.
(retrieve_video_parameters): Likewise.
(grub_multiboot_make_mbi): Fill video fields.
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video driver ids.

View file

@ -1,20 +1,9 @@
2010-01-14 Vladimir Serbinenko <phcoder@gmail.com>
Video multiboot support.
VBE multiboot support.
* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
New prototype.
* 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.
* loader/i386/multiboot_mbi.c (HAS_VBE): New constant.
(grub_multiboot_get_mbi_size) [HAS_VBE]: Account for VBE structures.
(grub_multiboot_make_mbi) [HAS_VBE]: Likewise.
(fill_vbe_info) [HAS_VBE]: New function.
(retrieve_video_parameters) [HAS_VBE]: Call fill_vbe_info.