Merge tag 'dm-pull-5dec18' of git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / include / efi_api.h

diff --git a/include/efi_api.h b/include/efi_api.h
index bea19a5..aef77b6 100644 (file)
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -85,10 +85,10 @@ struct efi_boot_services {
        efi_status_t (EFIAPI *check_event)(struct efi_event *event);
 #define EFI_NATIVE_INTERFACE   0x00000000
        efi_status_t (EFIAPI *install_protocol_interface)(
-                       void **handle, const efi_guid_t *protocol,
+                       efi_handle_t *handle, const efi_guid_t *protocol,
                        int protocol_interface_type, void *protocol_interface);
        efi_status_t (EFIAPI *reinstall_protocol_interface)(
-                       void *handle, const efi_guid_t *protocol,
+                       efi_handle_t handle, const efi_guid_t *protocol,
                        void *old_interface, void *new_interface);
        efi_status_t (EFIAPI *uninstall_protocol_interface)(
                        efi_handle_t handle, const efi_guid_t *protocol,
@@ -164,9 +164,9 @@ struct efi_boot_services {
        efi_status_t (EFIAPI *locate_protocol)(const efi_guid_t *protocol,
                        void *registration, void **protocol_interface);
        efi_status_t (EFIAPI *install_multiple_protocol_interfaces)(
-                       void **handle, ...);
+                       efi_handle_t *handle, ...);
        efi_status_t (EFIAPI *uninstall_multiple_protocol_interfaces)(
-                       void *handle, ...);
+                       efi_handle_t handle, ...);
        efi_status_t (EFIAPI *calculate_crc32)(const void *data,
                                               efi_uintn_t data_size,
                                               u32 *crc32);
@@ -241,8 +241,8 @@ struct efi_runtime_services {
        efi_status_t (EFIAPI *query_capsule_caps)(
                        struct efi_capsule_header **capsule_header_array,
                        efi_uintn_t capsule_count,
-                       u64 maximum_capsule_size,
-                       u32 reset_type);
+                       u64 *maximum_capsule_size,
+                       u32 *reset_type);
        efi_status_t (EFIAPI *query_variable_info)(
                        u32 attributes,
                        u64 *maximum_variable_storage_size,
@@ -914,9 +914,9 @@ struct efi_file_handle {
        efi_status_t (EFIAPI *write)(struct efi_file_handle *file,
                        efi_uintn_t *buffer_size, void *buffer);
        efi_status_t (EFIAPI *getpos)(struct efi_file_handle *file,
-                       efi_uintn_t *pos);
+                                     u64 *pos);
        efi_status_t (EFIAPI *setpos)(struct efi_file_handle *file,
-                       efi_uintn_t pos);
+                                     u64 pos);
        efi_status_t (EFIAPI *getinfo)(struct efi_file_handle *file,
                        const efi_guid_t *info_type, efi_uintn_t *buffer_size,
                        void *buffer);
@@ -965,7 +965,7 @@ struct efi_file_info {
        struct efi_time last_access_time;
        struct efi_time modification_time;
        u64 attribute;
-       s16 file_name[0];
+       u16 file_name[0];
 };
 
 struct efi_file_system_info {