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

2009-04-14 Bean <bean123ch@gmail.com>

Browse source 
* Makefile.in (pkglib_DATA): Add handler.lst.
	(handler.lst): New rule.

	* conf/i386-pc.rmk (normal_mod_SOURCES): Add normal/handler.c.
	* conf/i386-coreboot.rmk: Likewise.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-efi.rmk: Likewise.
	* conf/x86_64-efi.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk: Likewise.

	* genhandlerlist.sh: New file.

	* genmk.rb: Add rules to generate handler.lst.

	* include/grub/normal.h (grub_file_getline): New function definition.
	(read_handler_list): Likewise.
	(free_handler_list): Likewise.

	* include/grub/term.h (grub_term_register_input): Add name parameter
	for auto generation of handler.lst.
	(grub_term_register_output): Likewise.

	* normal/handler.c: New file.

	* normal/main.c (get_line): Renamed to grub_file_getline.
	(read_config_file): Use the newly renamed grub_file_getline.
	(read_command_list): Likewise.
	(read_fs_list): Likewise.
	(grub_normal_execute): Call read_handler_list to parse handler.lst.
	(GRUB_MOD_FINI): Call free_handler_list to free handler list.

	* term/efi/console.c (grub_console_init): Add name parameter for auto
	generation of handler.lst.
	* term/gfxterm.c: Likewise.
	* term/i386/pc/at_keyboard.c: Likewise.
	* term/i386/pc/console.c: Likewise.
	* term/i386/pc/serial.c: Likewise.
	* term/i386/pc/vesafb.c: Likewise.
	* term/i386/pc/vga.c: Likewise.
	* term/i386/pc/vga_text.c: Likewise.
	* term/ieee1275/ofconsole.c: Likewise.
	* term/usb_keyboard.c: Likewise.
This commit is contained in:
bean 2009-04-14 18:12:14 +00:00
parent 33c846be29
commit d05f0df3eb
26 changed files with 352 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
term/efi/console.c
View file

@ -366,8 +366,8 @@ grub_console_init (void)
return;
}
grub_term_register_input (&grub_console_term_input);
grub_term_register_output (&grub_console_term_output);
grub_term_register_input ("console", &grub_console_term_input);
grub_term_register_output ("console", &grub_console_term_output);
}
void

2
term/gfxterm.c
View file

@ -1155,7 +1155,7 @@ static grub_command_t cmd;
GRUB_MOD_INIT(term_gfxterm)
{
my_mod = mod;
grub_term_register_output (&grub_video_term);
grub_term_register_output ("gfxterm", &grub_video_term);
cmd = grub_register_command ("background_image",
grub_gfxterm_background_image_cmd,
0, "Load background image for active terminal");

2
term/i386/pc/at_keyboard.c
View file

@ -226,7 +226,7 @@ static struct grub_term_input grub_at_keyboard_term =
GRUB_MOD_INIT(at_keyboard)
{
grub_term_register_input (&grub_at_keyboard_term);
grub_term_register_input ("at_keyboard", &grub_at_keyboard_term);
}
GRUB_MOD_FINI(at_keyboard)

4
term/i386/pc/console.c
View file

@ -46,8 +46,8 @@ static struct grub_term_output grub_console_term_output =
void
grub_console_init (void)
{
grub_term_register_output (&grub_console_term_output);
grub_term_register_input (&grub_console_term_input);
grub_term_register_output ("console", &grub_console_term_output);
grub_term_register_input ("console", &grub_console_term_input);
}
void

4
term/i386/pc/serial.c
View file

@ -577,8 +577,8 @@ grub_cmd_serial (grub_extcmd_t cmd,
/* Register terminal if not yet registered. */
if (registered == 0)
{
grub_term_register_input (&grub_serial_term_input);
grub_term_register_output (&grub_serial_term_output);
grub_term_register_input ("serial", &grub_serial_term_input);
grub_term_register_output ("serial", &grub_serial_term_output);
registered = 1;
}
}

2
term/i386/pc/vesafb.c
View file

@ -599,7 +599,7 @@ static struct grub_term_output grub_vesafb_term =
GRUB_MOD_INIT(vesafb)
{
my_mod = mod;
grub_term_register_output (&grub_vesafb_term);
grub_term_register_output ("vesafb", &grub_vesafb_term);
}
GRUB_MOD_FINI(vesafb)

3
term/i386/pc/vga.c
View file

@ -25,7 +25,6 @@
#include <grub/types.h>
#include <grub/dl.h>
#include <grub/misc.h>
#include <grub/normal.h>
#include <grub/font.h>
#define DEBUG_VGA 0
@ -509,7 +508,7 @@ GRUB_MOD_INIT(vga)
#ifndef GRUB_UTIL
my_mod = mod;
#endif
grub_term_register_output (&grub_vga_term);
grub_term_register_output ("vga", &grub_vga_term);
}
GRUB_MOD_FINI(vga)

2
term/i386/pc/vga_text.c
View file

@ -168,7 +168,7 @@ static struct grub_term_output grub_vga_text_term =
GRUB_MOD_INIT(vga_text)
{
grub_term_register_output (&grub_vga_text_term);
grub_term_register_output ("vga_text", &grub_vga_text_term);
}
GRUB_MOD_FINI(vga_text)

4
term/ieee1275/ofconsole.c
View file

@ -420,8 +420,8 @@ static struct grub_term_output grub_ofconsole_term_output =
void
grub_console_init (void)
{
grub_term_register_input (&grub_ofconsole_term_input);
grub_term_register_output (&grub_ofconsole_term_output);
grub_term_register_input ("ofconsole", &grub_ofconsole_term_input);
grub_term_register_output ("ofconsole", &grub_ofconsole_term_output);
}
void

2
term/usb_keyboard.c
View file

@ -247,7 +247,7 @@ GRUB_MOD_INIT(usb_keyboard)
(void) mod; /* To stop warning. */
grub_usb_hid ();
grub_term_register_input (&grub_usb_keyboard_term);
grub_term_register_input ("usb_keyboard", &grub_usb_keyboard_term);
}
GRUB_MOD_FINI(usb_keyboard)