efi_loader: struct efi_simple_text_input_protocol

%s/efi_simple_input_interface/efi_simple_text_input_protocol/

We should be consistent in the naming of the EFI protocol interface
structures. The protocol is called EFI_SIMPLE_TEXT_INPUT_PROTOCOL.

%s/ExtendedVerification/extended_verification/

Use consistent naming of function parameters. Do not use CamelCase.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2018-09-08 10:20:10 +02:00 committed by Alexander Graf
parent da9ea5bb0d
commit 3e603ec757
6 changed files with 12 additions and 12 deletions

View file

@ -17,7 +17,7 @@
/* Information about the efi console */
struct serial_efi_priv {
struct efi_simple_input_interface *con_in;
struct efi_simple_text_input_protocol *con_in;
struct efi_simple_text_output_protocol *con_out;
struct efi_input_key key;
bool have_key;

View file

@ -308,7 +308,7 @@ struct efi_system_table {
u16 *fw_vendor; /* physical addr of wchar_t vendor string */
u32 fw_revision;
efi_handle_t con_in_handle;
struct efi_simple_input_interface *con_in;
struct efi_simple_text_input_protocol *con_in;
efi_handle_t con_out_handle;
struct efi_simple_text_output_protocol *con_out;
efi_handle_t stderr_handle;
@ -598,11 +598,11 @@ struct efi_input_key {
EFI_GUID(0x387477c1, 0x69c7, 0x11d2, \
0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
struct efi_simple_input_interface {
efi_status_t(EFIAPI *reset)(struct efi_simple_input_interface *this,
bool ExtendedVerification);
struct efi_simple_text_input_protocol {
efi_status_t(EFIAPI *reset)(struct efi_simple_text_input_protocol *this,
bool extended_verification);
efi_status_t(EFIAPI *read_key_stroke)(
struct efi_simple_input_interface *this,
struct efi_simple_text_input_protocol *this,
struct efi_input_key *key);
struct efi_event *wait_for_key;
};

View file

@ -92,7 +92,7 @@ extern struct efi_runtime_services efi_runtime_services;
extern struct efi_system_table systab;
extern struct efi_simple_text_output_protocol efi_con_out;
extern struct efi_simple_input_interface efi_con_in;
extern struct efi_simple_text_input_protocol efi_con_in;
extern struct efi_console_control_protocol efi_console_control;
extern const struct efi_device_path_to_text_protocol efi_device_path_to_text;
/* implementation of the EFI_DEVICE_PATH_UTILITIES_PROTOCOL */

View file

@ -53,7 +53,7 @@ enum efi_test_phase {
};
extern struct efi_simple_text_output_protocol *con_out;
extern struct efi_simple_input_interface *con_in;
extern struct efi_simple_text_input_protocol *con_in;
/*
* Exit the boot services.

View file

@ -391,7 +391,7 @@ struct efi_simple_text_output_protocol efi_con_out = {
};
static efi_status_t EFIAPI efi_cin_reset(
struct efi_simple_input_interface *this,
struct efi_simple_text_input_protocol *this,
bool extended_verification)
{
EFI_ENTRY("%p, %d", this, extended_verification);
@ -446,7 +446,7 @@ out:
}
static efi_status_t EFIAPI efi_cin_read_key_stroke(
struct efi_simple_input_interface *this,
struct efi_simple_text_input_protocol *this,
struct efi_input_key *key)
{
struct efi_input_key pressed_key = {
@ -558,7 +558,7 @@ static efi_status_t EFIAPI efi_cin_read_key_stroke(
return EFI_EXIT(EFI_SUCCESS);
}
struct efi_simple_input_interface efi_con_in = {
struct efi_simple_text_input_protocol efi_con_in = {
.reset = efi_cin_reset,
.read_key_stroke = efi_cin_read_key_stroke,
.wait_for_key = NULL,

View file

@ -9,7 +9,7 @@
#include <vsprintf.h>
struct efi_simple_text_output_protocol *con_out;
struct efi_simple_input_interface *con_in;
struct efi_simple_text_input_protocol *con_in;
/*
* Print a MAC address to an u16 string