2009-03-01 Bean <bean123ch@gmail.com>
* commands/terminal.c: Removed. * commands/handler.c: New file. * include/grub/list.h: Likewise. * include/grub/handler.h: Likewise. * kern/list.c: Likewise. * kern/handler.c: Likewise. * kern/term.h: Include header file <grub/handler.h>. (grub_term_input): Move next field to the beginning. (grub_term_output): Likewise. (grub_term_input_class): New variable. (grub_term_output_class): Likewise. (grub_term_register_input): Changed to inline function. (grub_term_register_output): Likewise. (grub_term_unregister_input): Likewise. (grub_term_unregister_output): Likewise. (grub_term_set_current_input): Likewise. (grub_term_set_current_output): Likewise. (grub_term_get_current_input): Likewise. (grub_term_get_current_output): Likewise. (grub_term_iterate_input): Removed. (grub_term_iterate_output): Likewise. * kern/term.c (grub_term_list_input): Removed. (grub_term_list_output): Likewise. (grub_term_input_class): New variable. (grub_term_output_class): Likewise. (grub_cur_term_input): Change varaible as macro. (grub_cur_term_output): Likewise. (grub_term_register_input): Removed. (grub_term_register_output): Likewise. (grub_term_unregister_input): Likewise. (grub_term_unregister_output): Likewise. (grub_term_set_current_input): Likewise. (grub_term_set_current_output): Likewise. (grub_term_iterate_input): Likewise. (grub_term_iterate_output): Likewise. (grub_term_get_current_input): Likewise. (grub_term_get_current_output): Likewise. * util/grub-editenv.c: Include header file <grub/handler.h>. (grub_term_get_current_input): Removed. (grub_term_get_current_output): Likewise. (grub_term_input_class): New variable. (grub_term_outout_class): Likewise. * util/grub-fstest.c (grub_term_get_current_input): Removed. (grub_term_get_current_output): Likewise. (grub_term_input_class): New variable. (grub_term_outout_class): Likewise. * util/grub-probe.c (grub_term_get_current_input): Removed. (grub_term_get_current_output): Likewise. (grub_term_input_class): New variable. (grub_term_outout_class): Likewise. * util/i386/pc/grub-setup.c (grub_term_get_current_input): Removed. (grub_term_get_current_output): Likewise. (grub_term_input_class): New variable. (grub_term_outout_class): Likewise. * conf/common.rmk (pkglib_MODULES): Replace terminal with handler. (terminal_mod_SOURCES): Likewise. (terminal_mod_CFLAGS): Likewise. (terminal_mod_LDFLAGS): Likewise. * conf/i386-pc.rmk (grub_emu_SOURCES): Replace terminal.c with handler.c. (kernel_img_SOURCES): Add list.c and handler.c. (kernel_img_HEADERS): Add list.h and handler.h. * conf/i386-efi.rmk (grub_emu_SOURCES): Replace terminal.c with handler.c. (kernel_mod_SOURCES): Add list.c and handler.c. (kernel_mod_HEADERS): Add list.h and handler.h. * conf/i386-coreboot.rmk (grub_emu_SOURCES): Replace terminal.c with handler.c. (kernel_elf_SOURCES): Add list.c and handler.c. (kernel_elf_HEADERS): Add list.h and handler.h. * conf/i386-ieee1275.rmk (grub_emu_SOURCES): Replace terminal.c with handler.c. (kernel_elf_SOURCES): Add list.c and handler.c. (kernel_elf_HEADERS): Add list.h and handler.h. * conf/x86_64-efi.rmk (grub_emu_SOURCES): Replace terminal.c with handler.c. (kernel_mod_SOURCES): Add list.c and handler.c. (kernel_mod_HEADERS): Add list.h and handler.h. * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Replace terminal.c with handler.c. (kernel_elf_SOURCES): Add list.c and handler.c. (kernel_elf_HEADERS): Add list.h and handler.h.
This commit is contained in:
bean
parent
8a31787ff5
commit
71b9f36193
28 changed files with 812 additions and 420 deletions
132
commands/handler.c
Normal file
132
commands/handler.c
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
/* handler.c - test module for dynamic loading */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/normal.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/handler.h>
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_handler_generic (int argc, char **args, char *class_name)
|
||||
{
|
||||
char *find_name;
|
||||
void *find_result;
|
||||
void *curr_item = 0;
|
||||
grub_handler_class_t head;
|
||||
|
||||
auto int list_item (grub_named_list_t item);
|
||||
int list_item (grub_named_list_t item)
|
||||
{
|
||||
if (item == curr_item)
|
||||
grub_putchar ('*');
|
||||
|
||||
grub_printf ("%s\n", item->name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
head = grub_handler_class_list;
|
||||
if ((argc == 0) && (class_name == 0))
|
||||
{
|
||||
grub_list_iterate (head, (grub_list_hook_t) list_item);
|
||||
}
|
||||
else
|
||||
{
|
||||
grub_handler_class_t class;
|
||||
|
||||
if (class_name == 0)
|
||||
{
|
||||
class_name = args[0];
|
||||
argc--;
|
||||
args++;
|
||||
}
|
||||
|
||||
class = grub_named_list_find (GRUB_AS_NAMED_LIST (head), class_name);
|
||||
if (! class)
|
||||
return grub_error (GRUB_ERR_FILE_NOT_FOUND, "class not found");
|
||||
|
||||
if (argc == 0)
|
||||
{
|
||||
curr_item = class->cur_handler;
|
||||
grub_list_iterate (class->handler_list,
|
||||
(grub_list_hook_t) list_item);
|
||||
}
|
||||
else
|
||||
{
|
||||
grub_handler_t handler;
|
||||
|
||||
handler =
|
||||
grub_named_list_find (GRUB_AS_NAMED_LIST (class->handler_list),
|
||||
args[0]);
|
||||
|
||||
if (! handler)
|
||||
return grub_error (GRUB_ERR_FILE_NOT_FOUND, "handler not found");
|
||||
|
||||
grub_handler_set_current (class, handler);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_handler (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
return grub_cmd_handler_generic (argc, args, 0);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_terminal_input (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
return grub_cmd_handler_generic (argc, args, "terminal_input");
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_terminal_output (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
return grub_cmd_handler_generic (argc, args, "terminal_output");
|
||||
}
|
||||
|
||||
GRUB_MOD_INIT(handler)
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
grub_register_command ("handler", grub_cmd_handler, GRUB_COMMAND_FLAG_BOTH,
|
||||
"handler [class [handler]]",
|
||||
"List or select a handler", 0);
|
||||
grub_register_command ("terminal_input", grub_cmd_terminal_input,
|
||||
GRUB_COMMAND_FLAG_BOTH,
|
||||
"terminal_input [handler]",
|
||||
"List or select a handler", 0);
|
||||
grub_register_command ("terminal_output", grub_cmd_terminal_output,
|
||||
GRUB_COMMAND_FLAG_BOTH,
|
||||
"terminal_output [handler]",
|
||||
"List or select a handler", 0);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(handler)
|
||||
{
|
||||
grub_unregister_command ("terminal_input");
|
||||
grub_unregister_command ("terminal_output");
|
||||
grub_unregister_command ("handler");
|
||||
}
|
||||
|
|
@ -1,132 +0,0 @@
|
|||
/* terminal.c - command to show and select a terminal */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003,2005,2007,2008 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/normal.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/term.h>
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_terminal_input (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
grub_term_input_t term = 0;
|
||||
|
||||
auto int print_terminal (grub_term_input_t);
|
||||
auto int find_terminal (grub_term_input_t);
|
||||
|
||||
int print_terminal (grub_term_input_t t)
|
||||
{
|
||||
grub_printf (" %s", t->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int find_terminal (grub_term_input_t t)
|
||||
{
|
||||
if (grub_strcmp (t->name, args[0]) == 0)
|
||||
{
|
||||
term = t;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (argc == 0)
|
||||
{
|
||||
grub_printf ("Available input terminal(s):");
|
||||
grub_term_iterate_input (print_terminal);
|
||||
grub_putchar ('\n');
|
||||
|
||||
grub_printf ("Current input terminal: %s\n", grub_term_get_current_input ()->name);
|
||||
}
|
||||
else
|
||||
{
|
||||
grub_term_iterate_input (find_terminal);
|
||||
if (! term)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such input terminal");
|
||||
|
||||
grub_term_set_current_input (term);
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_terminal_output (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
grub_term_output_t term = 0;
|
||||
|
||||
auto int print_terminal (grub_term_output_t);
|
||||
auto int find_terminal (grub_term_output_t);
|
||||
|
||||
int print_terminal (grub_term_output_t t)
|
||||
{
|
||||
grub_printf (" %s", t->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int find_terminal (grub_term_output_t t)
|
||||
{
|
||||
if (grub_strcmp (t->name, args[0]) == 0)
|
||||
{
|
||||
term = t;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (argc == 0)
|
||||
{
|
||||
grub_printf ("Available output terminal(s):");
|
||||
grub_term_iterate_output (print_terminal);
|
||||
grub_putchar ('\n');
|
||||
|
||||
grub_printf ("Current output terminal: %s\n", grub_term_get_current_output ()->name);
|
||||
}
|
||||
else
|
||||
{
|
||||
grub_term_iterate_output (find_terminal);
|
||||
if (! term)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such output terminal");
|
||||
|
||||
grub_term_set_current_output (term);
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
||||
GRUB_MOD_INIT(terminal)
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
grub_register_command ("terminal_input", grub_cmd_terminal_input, GRUB_COMMAND_FLAG_BOTH,
|
||||
"terminal_input [TERM...]", "Select an input terminal.", 0);
|
||||
grub_register_command ("terminal_output", grub_cmd_terminal_output, GRUB_COMMAND_FLAG_BOTH,
|
||||
"terminal_output [TERM...]", "Select an output terminal.", 0);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(terminal)
|
||||
{
|
||||
grub_unregister_command ("terminal_input");
|
||||
grub_unregister_command ("terminal_output");
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue