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

2009-04-06 Pavel Roskin <proski@gnu.org>

Browse source 
* include/grub/misc.h (ARRAY_SIZE): New macro.
	* include/grub/i386/linux.h (GRUB_LINUX_VID_MODE_VESA_START):
	New macro.
	* loader/i386/linux.c (allocate_pages): Use free_pages().
	(grub_linux_unload): Don't use free_pages().
	(grub_linux_boot): Prevent accessing linux_vesafb_modes with a
	wrong index.  Treat all other modes as text modes.
	(grub_cmd_linux): Initialize vid_mode unconditionally to
	GRUB_LINUX_VID_MODE_NORMAL.  Recognize and support "vga=ask".
This commit is contained in:
proski 2009-04-07 00:48:57 +00:00
parent 761319cfd3
commit 1007d1f562
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/grub/i386/linux.h
View file

@ -38,6 +38,7 @@
#define GRUB_LINUX_VID_MODE_NORMAL 0xFFFF
#define GRUB_LINUX_VID_MODE_EXTENDED 0xFFFE
#define GRUB_LINUX_VID_MODE_ASK 0xFFFD
#define GRUB_LINUX_VID_MODE_VESA_START 0x0301
#define GRUB_LINUX_SETUP_MOVE_SIZE 0x9100
#define GRUB_LINUX_CL_MAGIC 0xA33F

1
include/grub/misc.h
View file

@ -26,6 +26,7 @@
#include <grub/err.h>
#define ALIGN_UP(addr, align) (((grub_uint64_t)addr + align - 1) & ~(align - 1))
#define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0]))
#define grub_dprintf(condition, fmt, args...) grub_real_dprintf(__FILE__, __LINE__, condition, fmt, ## args);
/* XXX: If grub_memmove is too slow, we must implement grub_memcpy. */