vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* loader/i386/multiboot_mbi.c (retrieve_video_parameters): Set red

Browse source 
field position and mask size to red fields from mode_info, not
green.
* loader/multiboot_mbi2.c (retrieve_video_parameters): Likewise.
Remove redundant tag->common.framebuffer_type assignment.
Reported by: Seth Goldberg.
This commit is contained in:
Colin Watson 2010-06-23 09:22:03 +01:00
parent e726542fa3
commit e9b29642bd
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-06-23 Colin Watson <cjwatson@ubuntu.com>
* loader/i386/multiboot_mbi.c (retrieve_video_parameters): Set red
field position and mask size to red fields from mode_info, not
green.
* loader/multiboot_mbi2.c (retrieve_video_parameters): Likewise.
Remove redundant tag->common.framebuffer_type assignment.
Reported by: Seth Goldberg.
2010-06-23 Colin Watson <cjwatson@ubuntu.com> 2010-06-23 Colin Watson <cjwatson@ubuntu.com>
Sync up other versions of the Linux loader with Robert Millan's Sync up other versions of the Linux loader with Robert Millan's

4
loader/i386/multiboot_mbi.c
View file

@ -295,8 +295,8 @@ retrieve_video_parameters (struct multiboot_info *mbi,
else else
{ {
mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB; mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
mbi->framebuffer_red_field_position = mode_info.green_field_pos; mbi->framebuffer_red_field_position = mode_info.red_field_pos;
mbi->framebuffer_red_mask_size = mode_info.green_mask_size; mbi->framebuffer_red_mask_size = mode_info.red_mask_size;
mbi->framebuffer_green_field_position = mode_info.green_field_pos; mbi->framebuffer_green_field_position = mode_info.green_field_pos;
mbi->framebuffer_green_mask_size = mode_info.green_mask_size; mbi->framebuffer_green_mask_size = mode_info.green_mask_size;
mbi->framebuffer_blue_field_position = mode_info.blue_field_pos; mbi->framebuffer_blue_field_position = mode_info.blue_field_pos;

5
loader/multiboot_mbi2.c
View file

@ -441,9 +441,8 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
else else
{ {
tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB; tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB; tag->framebuffer_red_field_position = mode_info.red_field_pos;
tag->framebuffer_red_field_position = mode_info.green_field_pos; tag->framebuffer_red_mask_size = mode_info.red_mask_size;
tag->framebuffer_red_mask_size = mode_info.green_mask_size;
tag->framebuffer_green_field_position = mode_info.green_field_pos; tag->framebuffer_green_field_position = mode_info.green_field_pos;
tag->framebuffer_green_mask_size = mode_info.green_mask_size; tag->framebuffer_green_mask_size = mode_info.green_mask_size;
tag->framebuffer_blue_field_position = mode_info.blue_field_pos; tag->framebuffer_blue_field_position = mode_info.blue_field_pos;