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

* loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix compilation on coreboot and qemu

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-30 11:18:29 +02:00
parent 016883a55c
commit af09641e2b
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-03-30 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix
compilation on coreboot and qemu
2010-03-28 Vladimir Serbinenko <phcoder@gmail.com> 2010-03-28 Vladimir Serbinenko <phcoder@gmail.com>
* include/multiboot2.h: Resync with spec. * include/multiboot2.h: Resync with spec.

18
loader/i386/multiboot_mbi2.c
View file

@ -34,13 +34,9 @@
#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU) #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
#include <grub/i386/pc/vbe.h> #include <grub/i386/pc/vbe.h>
#define DEFAULT_VIDEO_MODE "text"
#define HAS_VGA_TEXT 1 #define HAS_VGA_TEXT 1
#define HAS_VBE 1
#else #else
#define DEFAULT_VIDEO_MODE "auto"
#define HAS_VGA_TEXT 0 #define HAS_VGA_TEXT 0
#define HAS_VBE 0
#endif #endif
struct module struct module
@ -343,14 +339,20 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
if (driv_id == GRUB_VIDEO_DRIVER_NONE) if (driv_id == GRUB_VIDEO_DRIVER_NONE)
{ {
struct grub_vbe_mode_info_block vbe_mode_info; struct grub_vbe_mode_info_block vbe_mode_info;
grub_vbe_status_t status;
grub_uint32_t vbe_mode; grub_uint32_t vbe_mode;
void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
#if defined (GRUB_MACHINE_PCBIOS)
{
grub_vbe_status_t status;
void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
status = grub_vbe_bios_get_mode (scratch); status = grub_vbe_bios_get_mode (scratch);
vbe_mode = *(grub_uint32_t *) scratch; vbe_mode = *(grub_uint32_t *) scratch;
if (status != GRUB_VBE_STATUS_OK) if (status != GRUB_VBE_STATUS_OK)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
}
#else
vbe_mode = 3;
#endif
/* get_mode_info isn't available for mode 3. */ /* get_mode_info isn't available for mode 3. */
if (vbe_mode == 3) if (vbe_mode == 3)
@ -361,14 +363,18 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
vbe_mode_info.x_resolution = 80; vbe_mode_info.x_resolution = 80;
vbe_mode_info.y_resolution = 25; vbe_mode_info.y_resolution = 25;
} }
#if defined (GRUB_MACHINE_PCBIOS)
else else
{ {
grub_vbe_status_t status;
void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
status = grub_vbe_bios_get_mode_info (vbe_mode, scratch); status = grub_vbe_bios_get_mode_info (vbe_mode, scratch);
if (status != GRUB_VBE_STATUS_OK) if (status != GRUB_VBE_STATUS_OK)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
grub_memcpy (&vbe_mode_info, scratch, grub_memcpy (&vbe_mode_info, scratch,
sizeof (struct grub_vbe_mode_info_block)); sizeof (struct grub_vbe_mode_info_block));
} }
#endif
if (vbe_mode_info.memory_model == GRUB_VBE_MEMORY_MODEL_TEXT) if (vbe_mode_info.memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
{ {