diff options
| author | Heinrich Schuchardt | 2021-01-05 07:50:09 +0100 |
|---|---|---|
| committer | Heinrich Schuchardt | 2021-01-13 02:38:01 +0100 |
| commit | 7913c7dc57eb1ce6a145c36fab7918a0c8c6860d (patch) | |
| tree | 7bc66267d1af281b36c2413ace5384b70e89bbeb | |
| parent | 85fc2ad4d13e1311652049c7322f5d36aacfc572 (diff) | |
efi_loader: typedef efi_string_t text output protocol
We do not want to use typedefs in U-Boot.
Do not use efi_string_t in the EFI_TEXT_OUTPUT_PROTOCOL.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | include/efi_api.h | 4 | ||||
| -rw-r--r-- | lib/efi_loader/efi_console.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/efi_api.h b/include/efi_api.h index c635abe9a94..df9bee2ae43 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -701,10 +701,10 @@ struct efi_simple_text_output_protocol { char extended_verification); efi_status_t (EFIAPI *output_string)( struct efi_simple_text_output_protocol *this, - const efi_string_t str); + const u16 *str); efi_status_t (EFIAPI *test_string)( struct efi_simple_text_output_protocol *this, - const efi_string_t str); + const u16 *str); efi_status_t(EFIAPI *query_mode)( struct efi_simple_text_output_protocol *this, unsigned long mode_number, unsigned long *columns, diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 705109596eb..edcfce7becb 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -141,12 +141,12 @@ static int term_read_reply(int *n, int num, char end_char) */ static efi_status_t EFIAPI efi_cout_output_string( struct efi_simple_text_output_protocol *this, - const efi_string_t string) + const u16 *string) { struct simple_text_output_mode *con = &efi_con_mode; struct cout_mode *mode = &efi_cout_modes[con->mode]; char *buf, *pos; - u16 *p; + const u16 *p; efi_status_t ret = EFI_SUCCESS; EFI_ENTRY("%p, %p", this, string); @@ -230,7 +230,7 @@ out: */ static efi_status_t EFIAPI efi_cout_test_string( struct efi_simple_text_output_protocol *this, - const efi_string_t string) + const u16 *string) { EFI_ENTRY("%p, %p", this, string); return EFI_EXIT(EFI_SUCCESS); |