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>

diff --git a/include/efi_api.h b/include/efi_api.h
index c635abe9a94fc5c4adad1e3bff67e345a6b6cb37..df9bee2ae43833ba26905a3c5b805dbd308c785a 100644 (file)
--- 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 705109596eb214d5e8a807b6b39da38de6a76d69..edcfce7becbc5ee25c0d0ecddba0a361ed3703c9 100644 (file)
--- 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);