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

merge trunk

Browse source
This commit is contained in:
Colin Watson 2011-05-18 16:53:36 +01:00
commit e806ce60ee
431 changed files with 17605 additions and 2568 deletions
Download patch file Download diff file Expand all files Collapse all files

5
grub-core/video/i386/pc/vbe.c
View file

@ -30,6 +30,8 @@
#include <grub/video.h>
#include <grub/machine/int.h>
GRUB_MOD_LICENSE ("GPLv3+");
static int vbe_detected = -1;
static struct grub_vbe_info_block controller_info;
@ -793,7 +795,8 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info))
static grub_err_t
grub_video_vbe_setup (unsigned int width, unsigned int height,
unsigned int mode_type, unsigned int mode_mask)
grub_video_mode_type_t mode_type,
grub_video_mode_type_t mode_mask)
{
grub_uint16_t *p;
struct grub_vbe_mode_info_block vbe_mode_info;

5
grub-core/video/i386/pc/vga.c
View file

@ -30,6 +30,8 @@
#include <grub/misc.h>
#include <grub/vga.h>
GRUB_MOD_LICENSE ("GPLv3+");
#define VGA_WIDTH 640
#define VGA_HEIGHT 350
#define VGA_MEM ((grub_uint8_t *) GRUB_MEMORY_MACHINE_VGA_ADDR)
@ -116,7 +118,8 @@ grub_video_vga_init (void)
static grub_err_t
grub_video_vga_setup (unsigned int width, unsigned int height,
unsigned int mode_type, unsigned int mode_mask)
grub_video_mode_type_t mode_type,
grub_video_mode_type_t mode_mask)
{
grub_err_t err;