* 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.

diff --git a/ChangeLog b/ChangeLog
index b97f05d195c27d66031005f569226c66d3df9ff9..b37f0eff7c14d945dcaa108b37e4fae2d86067f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Sync up other versions of the Linux loader with Robert Millan's

diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 3d974f04ebdb1b1d0ae148c581b4a716e5a7c1ea..d984e4e4e265f4560475523711e828882fc8634b 100644 (file)
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -295,8 +295,8 @@ retrieve_video_parameters (struct multiboot_info *mbi,
   else
     {
       mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
-      mbi->framebuffer_red_field_position = mode_info.green_field_pos;
-      mbi->framebuffer_red_mask_size = mode_info.green_mask_size;
+      mbi->framebuffer_red_field_position = mode_info.red_field_pos;
+      mbi->framebuffer_red_mask_size = mode_info.red_mask_size;
       mbi->framebuffer_green_field_position = mode_info.green_field_pos;
       mbi->framebuffer_green_mask_size = mode_info.green_mask_size;
       mbi->framebuffer_blue_field_position = mode_info.blue_field_pos;

diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index c9e52e51ff854c205505829dd981e0f7cc8ccb52..3ad6a6c4a917b3e2959326d343e3c9764a8709a3 100644 (file)
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -441,9 +441,8 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
   else
     {
       tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
-      tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
-      tag->framebuffer_red_field_position = mode_info.green_field_pos;
-      tag->framebuffer_red_mask_size = mode_info.green_mask_size;
+      tag->framebuffer_red_field_position = mode_info.red_field_pos;
+      tag->framebuffer_red_mask_size = mode_info.red_mask_size;
       tag->framebuffer_green_field_position = mode_info.green_field_pos;
       tag->framebuffer_green_mask_size = mode_info.green_mask_size;
       tag->framebuffer_blue_field_position = mode_info.blue_field_pos;