efi/console: Move grub_console_set{colorstate,cursor} higher in the file
This is just a preparatory patch to move the functions higher in the file, since these will be called by the grub_prepare_for_text_output() function that will be introduced in a later patch. The logic is unchanged by this patch. Functions definitions are just moved to avoid a forward declaration in a later patch, keeping the code clean. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
parent
b0c7769a41
commit
30586747f1
|
@ -65,6 +65,47 @@ map_char (grub_uint32_t c)
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
grub_console_setcolorstate (struct grub_term_output *term
|
||||||
|
__attribute__ ((unused)),
|
||||||
|
grub_term_color_state state)
|
||||||
|
{
|
||||||
|
grub_efi_simple_text_output_interface_t *o;
|
||||||
|
|
||||||
|
if (grub_efi_is_finished)
|
||||||
|
return;
|
||||||
|
|
||||||
|
o = grub_efi_system_table->con_out;
|
||||||
|
|
||||||
|
switch (state) {
|
||||||
|
case GRUB_TERM_COLOR_STANDARD:
|
||||||
|
efi_call_2 (o->set_attributes, o, GRUB_TERM_DEFAULT_STANDARD_COLOR
|
||||||
|
& 0x7f);
|
||||||
|
break;
|
||||||
|
case GRUB_TERM_COLOR_NORMAL:
|
||||||
|
efi_call_2 (o->set_attributes, o, grub_term_normal_color & 0x7f);
|
||||||
|
break;
|
||||||
|
case GRUB_TERM_COLOR_HIGHLIGHT:
|
||||||
|
efi_call_2 (o->set_attributes, o, grub_term_highlight_color & 0x7f);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
|
||||||
|
int on)
|
||||||
|
{
|
||||||
|
grub_efi_simple_text_output_interface_t *o;
|
||||||
|
|
||||||
|
if (grub_efi_is_finished)
|
||||||
|
return;
|
||||||
|
|
||||||
|
o = grub_efi_system_table->con_out;
|
||||||
|
efi_call_2 (o->enable_cursor, o, on);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
|
grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
|
||||||
const struct grub_unicode_glyph *c)
|
const struct grub_unicode_glyph *c)
|
||||||
|
@ -281,47 +322,6 @@ grub_console_cls (struct grub_term_output *term __attribute__ ((unused)))
|
||||||
efi_call_2 (o->set_attributes, o, orig_attr);
|
efi_call_2 (o->set_attributes, o, orig_attr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
grub_console_setcolorstate (struct grub_term_output *term
|
|
||||||
__attribute__ ((unused)),
|
|
||||||
grub_term_color_state state)
|
|
||||||
{
|
|
||||||
grub_efi_simple_text_output_interface_t *o;
|
|
||||||
|
|
||||||
if (grub_efi_is_finished)
|
|
||||||
return;
|
|
||||||
|
|
||||||
o = grub_efi_system_table->con_out;
|
|
||||||
|
|
||||||
switch (state) {
|
|
||||||
case GRUB_TERM_COLOR_STANDARD:
|
|
||||||
efi_call_2 (o->set_attributes, o, GRUB_TERM_DEFAULT_STANDARD_COLOR
|
|
||||||
& 0x7f);
|
|
||||||
break;
|
|
||||||
case GRUB_TERM_COLOR_NORMAL:
|
|
||||||
efi_call_2 (o->set_attributes, o, grub_term_normal_color & 0x7f);
|
|
||||||
break;
|
|
||||||
case GRUB_TERM_COLOR_HIGHLIGHT:
|
|
||||||
efi_call_2 (o->set_attributes, o, grub_term_highlight_color & 0x7f);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
|
|
||||||
int on)
|
|
||||||
{
|
|
||||||
grub_efi_simple_text_output_interface_t *o;
|
|
||||||
|
|
||||||
if (grub_efi_is_finished)
|
|
||||||
return;
|
|
||||||
|
|
||||||
o = grub_efi_system_table->con_out;
|
|
||||||
efi_call_2 (o->enable_cursor, o, on);
|
|
||||||
}
|
|
||||||
|
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
grub_efi_console_output_init (struct grub_term_output *term)
|
grub_efi_console_output_init (struct grub_term_output *term)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue