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

merge

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-20 13:54:56 +01:00
commit 42f9e12abe
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog.videomask Normal file
View file

@ -0,0 +1,10 @@
2009-11-20 Vladimir Serbinenko <phcoder@gmail.com>
Use flag-based instead of hook-based video mode selection and "auto"
keyword.
* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
(grub_video_set_mode): Changed prototype. All users updated.
(grub_video_check_mode_flag): New inline function.
* video/video.c (parse_modespec): New function.
(grub_video_set_mode): Parse flags and keywords.

7
conf/i386-pc.rmk
View file

@ -155,7 +155,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
\ \
video/video.c video/fb/video_fb.c video/fb/fbblit.c \ video/video.c video/fb/video_fb.c video/fb/fbblit.c \
video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c \ video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c \
video/bitmap.c video/readers/tga.c video/readers/jpeg.c \ video/bitmap.c video/bitmap_scale.c video/readers/tga.c video/readers/jpeg.c \
video/readers/png.c font/font_cmd.c font/font.c term/gfxterm.c \ video/readers/png.c font/font_cmd.c font/font.c term/gfxterm.c \
io/bufio.c \ io/bufio.c \
\ \
@ -175,6 +175,11 @@ grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c \
grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB) grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
endif endif
ifeq ($(enable_grub_emu_sdl), yes)
grub_emu_SOURCES += util/sdl.c
grub_emu_LDFLAGS += $(LIBSDL)
endif
sbin_SCRIPTS += grub-install sbin_SCRIPTS += grub-install
grub_install_SOURCES = util/grub-install.in grub_install_SOURCES = util/grub-install.in

1
video/video.c
View file

@ -624,7 +624,6 @@ grub_video_set_mode (const char *modestring,
/* Loop thru all possible video adapter trying to find requested mode. */ /* Loop thru all possible video adapter trying to find requested mode. */
for (p = grub_video_adapter_list; p; p = p->next) for (p = grub_video_adapter_list; p; p = p->next)
{ {
grub_err_t err;
struct grub_video_mode_info mode_info; struct grub_video_mode_info mode_info;
grub_memset (&mode_info, 0, sizeof (mode_info)); grub_memset (&mode_info, 0, sizeof (mode_info));