651c29b79e
Modularize at_keyboard.mod: * conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'. (at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS) (at_keyboard_mod_LDFLAGS): New variables. Actual terminal split: * include/grub/term.h (struct grub_term): Split in ... (struct grub_term_input): ... this, and ... (struct grub_term_output): ... this. Update all users. (grub_term_set_current): Split in ... (grub_term_set_current_input): ... this, and ... (grub_term_set_current_output): ... this. (grub_term_get_current): Split in ... (grub_term_get_current_input): ... this, and ... (grub_term_get_current_output): ... this. (grub_term_register): Split in ... (grub_term_register_input): ... this, and ... (grub_term_register_output): ... this. (grub_term_unregister): Split in ... (grub_term_unregister_input): ... this, and ... (grub_term_unregister_output): ... this. (grub_term_iterate): Split in ... (grub_term_iterate_input): ... this, and ... (grub_term_iterate_output): ... this. * kern/term.c (grub_term_list): Split in ... (grub_term_list_input): ... this, and ... (grub_term_list_output): ... this. Update all users. (grub_cur_term): Split in ... (grub_cur_term_input): ... this, and ... (grub_cur_term_output): ... this. Update all users. (grub_term_set_current): Split in ... (grub_term_set_current_input): ... this, and ... (grub_term_set_current_output): ... this. (grub_term_get_current): Split in ... (grub_term_get_current_input): ... this, and ... (grub_term_get_current_output): ... this. (grub_term_register): Split in ... (grub_term_register_input): ... this, and ... (grub_term_register_output): ... this. (grub_term_unregister): Split in ... (grub_term_unregister_input): ... this, and ... (grub_term_unregister_output): ... this. (grub_term_iterate): Split in ... (grub_term_iterate_input): ... this, and ... (grub_term_iterate_output): ... this. * kern/misc.c (grub_abort): Split use of grub_term_get_current() into a check for input and one for output (and only attempt to get keys from user when input works). * util/grub-probe.c (grub_term_get_current): Split in ... (grub_term_get_current_input): ... this, and ... (grub_term_get_current_output): ... this. * util/grub-fstest.c: Likewise. * util/i386/pc/grub-setup.c: Likewise. * util/grub-editenv.c: Likewise. Portability adjustments: * conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove `term/i386/pc/at_keyboard.c'. * kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to grub_keyboard_controller_init() (now handled by terminal .init). * kern/i386/coreboot/init.c (grub_machine_init): Add call to grub_at_keyboard_init(). * include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init) (grub_console_checkkey, grub_console_getkey): Remove (now provided by at_keyboard.mod via input terminal interface). * include/grub/i386/coreboot/console.h: Convert into a stub for `<grub/i386/pc/console.h>'. Migrate full terminals to new API: * term/efi/console.c (grub_console_term): Split into ... (grub_console_term_input): ... this, and ... (grub_console_term_output): ... this. Update all users. * term/ieee1275/ofconsole.c: Remove __i386__ hack. (grub_ofconsole_init): Split into ... (grub_ofconsole_init_input): ... this, and ... (grub_ofconsole_init_output): ... this. (grub_ofconsole_term): Split into ... (grub_ofconsole_term_input): ... this, and ... (grub_ofconsole_term_output): ... this. Update all users. * term/i386/pc/serial.c (grub_serial_term): Split into ... (grub_serial_term_input): ... this, and ... (grub_serial_term_output): ... this. Update all users. * term/i386/pc/console.c (grub_console_term): Split into ... (grub_console_term_input): ... this, and ... (grub_console_term_output): ... this. Update all users. (grub_console_term_input): Only enable it on PC/BIOS platform. (grub_console_init): Remove grub_keyboard_controller_init() call. Migrate input terminals to new API: * term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with `i386' and `i386/pc' to enable build on x86_64 (this driver is i386-specific anyway). (grub_console_checkkey): Rename to ... (grub_at_keyboard_checkkey): ... this. Static-ize. Update all users. (grub_keyboard_controller_orig): New variable. (grub_console_getkey): Rename to ... (grub_at_keyboard_getkey): ... this. Static-ize. Update all users. (grub_keyboard_controller_init): Static-ize. Save original controller value so that it can be restored ... (grub_keyboard_controller_fini): ... here (new function). (grub_at_keyboard_term): New structure. (GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New functions. Migrate output terminals to new API: * term/i386/pc/vga.c (grub_vga_term): Change type to `struct grub_term_output'. Remove `.checkkey' and `.getkey' members. Update all users. * term/gfxterm.c (grub_video_term): Change type to `struct grub_term_output'. Remove `.checkkey' and `.getkey' members. Update all users. * include/grub/i386/pc/console.h (grub_console_checkkey) (grub_console_getkey): Do not export (no longer needed by gfxterm, etc). Migrate `terminal' command and userland tools to new API: * commands/terminal.c (grub_cmd_terminal): Split into ... (grub_cmd_terminal_input): ... this, and ... (grub_cmd_terminal_output): ... this. (GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands: `terminal_input' and `terminal_output'. * util/grub.d/00_header.in: Adjust `terminal' calls to new `terminal_input' / `terminal_output' API. * util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and ${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user provided ${GRUB_TERMINAL}, convert it).
175 lines
4.3 KiB
C
175 lines
4.3 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,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/machine/machine.h>
|
|
#include <grub/machine/console.h>
|
|
#include <grub/term.h>
|
|
#include <grub/types.h>
|
|
|
|
grub_uint8_t grub_console_cur_color = 0x7;
|
|
static grub_uint8_t grub_console_standard_color = 0x7;
|
|
static grub_uint8_t grub_console_normal_color = 0x7;
|
|
static grub_uint8_t grub_console_highlight_color = 0x70;
|
|
|
|
static grub_uint32_t
|
|
map_char (grub_uint32_t c)
|
|
{
|
|
if (c > 0x7f)
|
|
{
|
|
/* Map some unicode characters to the VGA font, if possible. */
|
|
switch (c)
|
|
{
|
|
case 0x2190: /* left arrow */
|
|
c = 0x1b;
|
|
break;
|
|
case 0x2191: /* up arrow */
|
|
c = 0x18;
|
|
break;
|
|
case 0x2192: /* right arrow */
|
|
c = 0x1a;
|
|
break;
|
|
case 0x2193: /* down arrow */
|
|
c = 0x19;
|
|
break;
|
|
case 0x2501: /* horizontal line */
|
|
c = 0xc4;
|
|
break;
|
|
case 0x2503: /* vertical line */
|
|
c = 0xb3;
|
|
break;
|
|
case 0x250F: /* upper-left corner */
|
|
c = 0xda;
|
|
break;
|
|
case 0x2513: /* upper-right corner */
|
|
c = 0xbf;
|
|
break;
|
|
case 0x2517: /* lower-left corner */
|
|
c = 0xc0;
|
|
break;
|
|
case 0x251B: /* lower-right corner */
|
|
c = 0xd9;
|
|
break;
|
|
|
|
default:
|
|
c = '?';
|
|
break;
|
|
}
|
|
}
|
|
|
|
return c;
|
|
}
|
|
|
|
static void
|
|
grub_console_putchar (grub_uint32_t c)
|
|
{
|
|
grub_console_real_putchar (map_char (c));
|
|
}
|
|
|
|
static grub_ssize_t
|
|
grub_console_getcharwidth (grub_uint32_t c __attribute__ ((unused)))
|
|
{
|
|
/* For now, every printable character has the width 1. */
|
|
return 1;
|
|
}
|
|
|
|
static grub_uint16_t
|
|
grub_console_getwh (void)
|
|
{
|
|
return (80 << 8) | 25;
|
|
}
|
|
|
|
static void
|
|
grub_console_setcolorstate (grub_term_color_state state)
|
|
{
|
|
switch (state) {
|
|
case GRUB_TERM_COLOR_STANDARD:
|
|
grub_console_cur_color = grub_console_standard_color;
|
|
break;
|
|
case GRUB_TERM_COLOR_NORMAL:
|
|
grub_console_cur_color = grub_console_normal_color;
|
|
break;
|
|
case GRUB_TERM_COLOR_HIGHLIGHT:
|
|
grub_console_cur_color = grub_console_highlight_color;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
|
|
{
|
|
grub_console_normal_color = normal_color;
|
|
grub_console_highlight_color = highlight_color;
|
|
}
|
|
|
|
static void
|
|
grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
|
|
{
|
|
*normal_color = grub_console_normal_color;
|
|
*highlight_color = grub_console_highlight_color;
|
|
}
|
|
|
|
/* On non-BIOS platforms, console.c is used in combination with vga_text.c
|
|
(only to handle output). */
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
static struct grub_term_input grub_console_term_input =
|
|
{
|
|
.name = "console",
|
|
.checkkey = grub_console_checkkey,
|
|
.getkey = grub_console_getkey,
|
|
};
|
|
#endif
|
|
|
|
static struct grub_term_output grub_console_term_output =
|
|
{
|
|
.name = "console",
|
|
.putchar = grub_console_putchar,
|
|
.getcharwidth = grub_console_getcharwidth,
|
|
.getwh = grub_console_getwh,
|
|
.getxy = grub_console_getxy,
|
|
.gotoxy = grub_console_gotoxy,
|
|
.cls = grub_console_cls,
|
|
.setcolorstate = grub_console_setcolorstate,
|
|
.setcolor = grub_console_setcolor,
|
|
.getcolor = grub_console_getcolor,
|
|
.setcursor = grub_console_setcursor,
|
|
.flags = 0,
|
|
};
|
|
|
|
void
|
|
grub_console_init (void)
|
|
{
|
|
grub_term_register_output (&grub_console_term_output);
|
|
grub_term_set_current_output (&grub_console_term_output);
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
grub_term_register_input (&grub_console_term_input);
|
|
grub_term_set_current_input (&grub_console_term_input);
|
|
#endif
|
|
}
|
|
|
|
void
|
|
grub_console_fini (void)
|
|
{
|
|
grub_term_set_current_output (&grub_console_term_output);
|
|
#ifdef GRUB_MACHINE_PCBIOS
|
|
grub_term_set_current_input (&grub_console_term_input);
|
|
grub_term_unregister_input (&grub_console_term_input);
|
|
#endif
|
|
grub_term_unregister_output (&grub_console_term_output);
|
|
}
|