2006-04-19 08:59:44 +00:00
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2009-01-10 13:07:44 +00:00
|
|
|
* Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
|
2006-04-19 08:59:44 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2006-04-19 08:59:44 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2006-04-19 08:59:44 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2006-04-19 08:59:44 +00:00
|
|
|
* 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
|
2007-07-21 23:32:33 +00:00
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2006-04-19 08:59:44 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/term.h>
|
2006-04-30 21:09:37 +00:00
|
|
|
#include <grub/misc.h>
|
2006-04-19 08:59:44 +00:00
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/efi/efi.h>
|
|
|
|
#include <grub/efi/api.h>
|
|
|
|
#include <grub/efi/console.h>
|
|
|
|
|
2010-05-07 23:06:22 +00:00
|
|
|
static const grub_uint8_t
|
2006-04-19 08:59:44 +00:00
|
|
|
grub_console_standard_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_YELLOW,
|
|
|
|
GRUB_EFI_BACKGROUND_BLACK);
|
|
|
|
|
|
|
|
static int read_key = -1;
|
|
|
|
|
2008-07-17 09:50:26 +00:00
|
|
|
static grub_uint32_t
|
|
|
|
map_char (grub_uint32_t c)
|
|
|
|
{
|
2010-05-09 11:20:35 +00:00
|
|
|
/* Map some unicode characters to the EFI character. */
|
|
|
|
switch (c)
|
2008-07-17 09:50:26 +00:00
|
|
|
{
|
2010-05-09 11:20:35 +00:00
|
|
|
case GRUB_UNICODE_LEFTARROW:
|
|
|
|
c = GRUB_UNICODE_BLACK_LEFT_TRIANGLE;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_UPARROW:
|
|
|
|
c = GRUB_UNICODE_BLACK_UP_TRIANGLE;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_RIGHTARROW:
|
|
|
|
c = GRUB_UNICODE_BLACK_RIGHT_TRIANGLE;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_DOWNARROW:
|
|
|
|
c = GRUB_UNICODE_BLACK_DOWN_TRIANGLE;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_HLINE:
|
|
|
|
c = GRUB_UNICODE_LIGHT_HLINE;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_VLINE:
|
|
|
|
c = GRUB_UNICODE_LIGHT_VLINE;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_CORNER_UL:
|
|
|
|
c = GRUB_UNICODE_LIGHT_CORNER_UL;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_CORNER_UR:
|
|
|
|
c = GRUB_UNICODE_LIGHT_CORNER_UR;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_CORNER_LL:
|
|
|
|
c = GRUB_UNICODE_LIGHT_CORNER_LL;
|
|
|
|
break;
|
|
|
|
case GRUB_UNICODE_CORNER_LR:
|
|
|
|
c = GRUB_UNICODE_LIGHT_CORNER_LR;
|
|
|
|
break;
|
2008-07-17 09:50:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
static void
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
|
|
|
|
const struct grub_unicode_glyph *c)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
2010-03-15 23:23:49 +00:00
|
|
|
grub_efi_char16_t str[2 + c->ncomb];
|
2006-04-19 08:59:44 +00:00
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
2010-03-15 23:23:49 +00:00
|
|
|
unsigned i, j;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
/* For now, do not try to use a surrogate pair. */
|
2010-03-15 23:23:49 +00:00
|
|
|
if (c->base > 0xffff)
|
|
|
|
str[0] = '?';
|
|
|
|
else
|
|
|
|
str[0] = (grub_efi_char16_t) map_char (c->base & 0xffff);
|
|
|
|
j = 1;
|
|
|
|
for (i = 0; i < c->ncomb; i++)
|
|
|
|
if (c->base < 0xffff)
|
|
|
|
str[j++] = c->combining[i].code;
|
|
|
|
str[j] = 0;
|
2006-04-19 08:59:44 +00:00
|
|
|
|
|
|
|
/* Should this test be cached? */
|
2010-03-15 23:23:49 +00:00
|
|
|
if ((c->base > 0x7f || c->ncomb)
|
|
|
|
&& efi_call_2 (o->test_string, o, str) != GRUB_EFI_SUCCESS)
|
2006-04-19 08:59:44 +00:00
|
|
|
return;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-07-17 09:50:26 +00:00
|
|
|
efi_call_2 (o->output_string, o, str);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_checkkey (struct grub_term_input *term __attribute__ ((unused)))
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_input_interface_t *i;
|
|
|
|
grub_efi_input_key_t key;
|
2006-04-30 21:09:37 +00:00
|
|
|
grub_efi_status_t status;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return 0;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
if (read_key >= 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
i = grub_efi_system_table->con_in;
|
2008-07-17 09:50:26 +00:00
|
|
|
status = efi_call_2 (i->read_key_stroke, i, &key);
|
|
|
|
#if 0
|
2006-04-30 21:09:37 +00:00
|
|
|
switch (status)
|
|
|
|
{
|
|
|
|
case GRUB_EFI_SUCCESS:
|
|
|
|
{
|
|
|
|
grub_uint16_t xy;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-04-30 21:09:37 +00:00
|
|
|
xy = grub_getxy ();
|
|
|
|
grub_gotoxy (0, 0);
|
|
|
|
grub_printf ("scan_code=%x,unicode_char=%x ",
|
|
|
|
(unsigned) key.scan_code,
|
|
|
|
(unsigned) key.unicode_char);
|
|
|
|
grub_gotoxy (xy >> 8, xy & 0xff);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GRUB_EFI_NOT_READY:
|
|
|
|
//grub_printf ("not ready ");
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
//grub_printf ("device error ");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-04-30 21:09:37 +00:00
|
|
|
if (status == GRUB_EFI_SUCCESS)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
switch (key.scan_code)
|
|
|
|
{
|
|
|
|
case 0x00:
|
|
|
|
read_key = key.unicode_char;
|
|
|
|
break;
|
|
|
|
case 0x01:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_UP;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x02:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_DOWN;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x03:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_RIGHT;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x04:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_LEFT;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x05:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_HOME;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x06:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_END;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x07:
|
|
|
|
break;
|
|
|
|
case 0x08:
|
2010-04-09 19:35:52 +00:00
|
|
|
read_key = GRUB_TERM_DC;
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case 0x09:
|
|
|
|
break;
|
|
|
|
case 0x0a:
|
2006-04-30 21:09:37 +00:00
|
|
|
break;
|
2008-07-17 09:50:26 +00:00
|
|
|
case 0x0b:
|
|
|
|
read_key = 24;
|
|
|
|
break;
|
|
|
|
case 0x0c:
|
|
|
|
read_key = 1;
|
|
|
|
break;
|
|
|
|
case 0x0d:
|
|
|
|
read_key = 5;
|
|
|
|
break;
|
2010-04-09 19:16:17 +00:00
|
|
|
case 0x0e:
|
|
|
|
read_key = 3;
|
|
|
|
break;
|
2006-04-19 08:59:44 +00:00
|
|
|
case 0x17:
|
|
|
|
read_key = '\e';
|
|
|
|
break;
|
|
|
|
default:
|
2006-04-30 21:09:37 +00:00
|
|
|
break;
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-05-27 21:09:25 +00:00
|
|
|
return read_key;
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_getkey (struct grub_term_input *term)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_input_interface_t *i;
|
|
|
|
grub_efi_boot_services_t *b;
|
|
|
|
grub_efi_uintn_t index;
|
|
|
|
grub_efi_status_t status;
|
|
|
|
int key;
|
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return 0;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
if (read_key >= 0)
|
|
|
|
{
|
|
|
|
key = read_key;
|
|
|
|
read_key = -1;
|
|
|
|
return key;
|
|
|
|
}
|
|
|
|
|
|
|
|
i = grub_efi_system_table->con_in;
|
|
|
|
b = grub_efi_system_table->boot_services;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2008-07-17 09:50:26 +00:00
|
|
|
status = efi_call_3 (b->wait_for_event, 1, &(i->wait_for_key), &index);
|
2006-04-19 08:59:44 +00:00
|
|
|
if (status != GRUB_EFI_SUCCESS)
|
2008-07-17 09:50:26 +00:00
|
|
|
return -1;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_checkkey (term);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
while (read_key < 0);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
key = read_key;
|
|
|
|
read_key = -1;
|
|
|
|
return key;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_uint16_t
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
grub_efi_uintn_t columns, rows;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished || efi_call_4 (o->query_mode, o, o->mode->mode,
|
|
|
|
&columns, &rows) != GRUB_EFI_SUCCESS)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
/* Why does this fail? */
|
|
|
|
columns = 80;
|
|
|
|
rows = 25;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ((columns << 8) | rows);
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_uint16_t
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_getxy (struct grub_term_output *term __attribute__ ((unused)))
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return 0;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
|
|
|
return ((o->mode->cursor_column << 8) | o->mode->cursor_row);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
|
|
|
|
grub_uint8_t x, grub_uint8_t y)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
2008-07-17 09:50:26 +00:00
|
|
|
efi_call_3 (o->set_cursor_position, o, x, y);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_cls (struct grub_term_output *term __attribute__ ((unused)))
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
2006-05-27 21:09:25 +00:00
|
|
|
grub_efi_int32_t orig_attr;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
2006-05-27 21:09:25 +00:00
|
|
|
orig_attr = o->mode->attribute;
|
2008-07-17 09:50:26 +00:00
|
|
|
efi_call_2 (o->set_attributes, o, GRUB_EFI_BACKGROUND_BLACK);
|
|
|
|
efi_call_1 (o->clear_screen, o);
|
|
|
|
efi_call_2 (o->set_attributes, o, orig_attr);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-05-07 23:06:22 +00:00
|
|
|
grub_console_setcolorstate (struct grub_term_output *term,
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_term_color_state state)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
|
|
|
|
|
|
|
switch (state) {
|
|
|
|
case GRUB_TERM_COLOR_STANDARD:
|
2008-07-17 09:50:26 +00:00
|
|
|
efi_call_2 (o->set_attributes, o, grub_console_standard_color);
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case GRUB_TERM_COLOR_NORMAL:
|
2010-05-07 23:06:22 +00:00
|
|
|
efi_call_2 (o->set_attributes, o, term->normal_color);
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
case GRUB_TERM_COLOR_HIGHLIGHT:
|
2010-05-07 23:06:22 +00:00
|
|
|
efi_call_2 (o->set_attributes, o, term->highlight_color);
|
2006-04-19 08:59:44 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-05-07 00:30:44 +00:00
|
|
|
grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
|
|
|
|
int on)
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
|
2010-04-20 16:08:26 +00:00
|
|
|
if (grub_efi_is_finished)
|
|
|
|
return;
|
|
|
|
|
2006-04-19 08:59:44 +00:00
|
|
|
o = grub_efi_system_table->con_out;
|
2008-07-17 09:50:26 +00:00
|
|
|
efi_call_2 (o->enable_cursor, o, on);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
|
2010-07-20 21:00:18 +00:00
|
|
|
static grub_err_t
|
|
|
|
grub_efi_console_init (struct grub_term_output *term)
|
|
|
|
{
|
|
|
|
grub_console_setcursor (term, 1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_efi_console_fini (struct grub_term_output *term)
|
|
|
|
{
|
|
|
|
grub_console_setcursor (term, 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
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).
2008-11-07 19:11:39 +00:00
|
|
|
static struct grub_term_input grub_console_term_input =
|
2006-04-19 08:59:44 +00:00
|
|
|
{
|
|
|
|
.name = "console",
|
|
|
|
.checkkey = grub_console_checkkey,
|
|
|
|
.getkey = grub_console_getkey,
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
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).
2008-11-07 19:11:39 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct grub_term_output grub_console_term_output =
|
|
|
|
{
|
|
|
|
.name = "console",
|
2010-07-20 21:00:18 +00:00
|
|
|
.init = grub_efi_console_init,
|
|
|
|
.fini = grub_efi_console_fini,
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
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).
2008-11-07 19:11:39 +00:00
|
|
|
.putchar = grub_console_putchar,
|
2006-04-19 08:59:44 +00:00
|
|
|
.getwh = grub_console_getwh,
|
|
|
|
.getxy = grub_console_getxy,
|
|
|
|
.gotoxy = grub_console_gotoxy,
|
|
|
|
.cls = grub_console_cls,
|
|
|
|
.setcolorstate = grub_console_setcolorstate,
|
2010-03-15 23:23:49 +00:00
|
|
|
.setcursor = grub_console_setcursor,
|
2010-05-07 23:06:22 +00:00
|
|
|
.normal_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_LIGHTGRAY,
|
|
|
|
GRUB_EFI_BACKGROUND_BLACK),
|
|
|
|
.highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
|
|
|
|
GRUB_EFI_BACKGROUND_LIGHTGRAY),
|
2010-04-09 17:30:57 +00:00
|
|
|
.flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
|
2006-04-19 08:59:44 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
void
|
|
|
|
grub_console_init (void)
|
|
|
|
{
|
|
|
|
/* FIXME: it is necessary to consider the case where no console control
|
|
|
|
is present but the default is already in text mode. */
|
|
|
|
if (! grub_efi_set_text_mode (1))
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_BAD_DEVICE, "cannot set text mode");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-01-09 22:42:17 +00:00
|
|
|
grub_term_register_input ("console", &grub_console_term_input);
|
|
|
|
grub_term_register_output ("console", &grub_console_term_output);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
grub_console_fini (void)
|
|
|
|
{
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
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).
2008-11-07 19:11:39 +00:00
|
|
|
grub_term_unregister_input (&grub_console_term_input);
|
|
|
|
grub_term_unregister_output (&grub_console_term_output);
|
2006-04-19 08:59:44 +00:00
|
|
|
}
|