colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi_loader: typedef efi_string_t text output protocol

Browse Source 
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>
This commit is contained in:
Heinrich Schuchardt
2021-01-05 07:50:09 +01:00
parent 85fc2ad4d1
commit 7913c7dc57
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/efi_api.h
View File

@@ -701,10 +701,10 @@ struct efi_simple_text_output_protocol {
char extended_verification); char extended_verification);
efi_status_t (EFIAPI *output_string)( efi_status_t (EFIAPI *output_string)(
struct efi_simple_text_output_protocol *this, struct efi_simple_text_output_protocol *this,
const efi_string_t str); const u16 *str);
efi_status_t (EFIAPI *test_string)( efi_status_t (EFIAPI *test_string)(
struct efi_simple_text_output_protocol *this, struct efi_simple_text_output_protocol *this,
const efi_string_t str); const u16 *str);
efi_status_t(EFIAPI *query_mode)( efi_status_t(EFIAPI *query_mode)(
struct efi_simple_text_output_protocol *this, struct efi_simple_text_output_protocol *this,
unsigned long mode_number, unsigned long *columns, unsigned long mode_number, unsigned long *columns,

6
lib/efi_loader/efi_console.c
View File

@@ -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( static efi_status_t EFIAPI efi_cout_output_string(
struct efi_simple_text_output_protocol *this, 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 simple_text_output_mode *con = &efi_con_mode;
struct cout_mode *mode = &efi_cout_modes[con->mode]; struct cout_mode *mode = &efi_cout_modes[con->mode];
char *buf, *pos; char *buf, *pos;
u16 *p; const u16 *p;
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;
EFI_ENTRY("%p, %p", this, string); EFI_ENTRY("%p, %p", this, string);
@@ -230,7 +230,7 @@ out:
*/ */
static efi_status_t EFIAPI efi_cout_test_string( static efi_status_t EFIAPI efi_cout_test_string(
struct efi_simple_text_output_protocol *this, struct efi_simple_text_output_protocol *this,
const efi_string_t string) const u16 *string)
{ {
EFI_ENTRY("%p, %p", this, string); EFI_ENTRY("%p, %p", this, string);
return EFI_EXIT(EFI_SUCCESS); return EFI_EXIT(EFI_SUCCESS);