From 607a39f9f0fb62a761ad9e928d8d9bc29129fc3e Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 14 Dec 2013 21:48:46 +0100 Subject: [PATCH] * include/grub/efi/api.h: Rename protocol and interface to avoid conflict. --- ChangeLog | 5 +++++ grub-core/kern/efi/efi.c | 2 +- include/grub/efi/api.h | 14 +++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3d7814fb..bdfe6394c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-12-14 Vladimir Serbinenko + + * include/grub/efi/api.h: Rename protocol and interface to avoid + conflict. + 2013-12-14 Vladimir Serbinenko * .gitignore: Add .exe variants. Add missing files. Remove few outdated diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c index 4ba185cc6..19a57d553 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -558,7 +558,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) grub_memcpy (&usb, dp, len); grub_printf ("/USB(%x,%x)", (unsigned) usb.parent_port_number, - (unsigned) usb.interface); + (unsigned) usb.usb_interface); } break; case GRUB_EFI_USB_CLASS_DEVICE_PATH_SUBTYPE: diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h index d6d3ec745..623ef14f9 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -716,7 +716,7 @@ struct grub_efi_usb_device_path { grub_efi_device_path_t header; grub_efi_uint8_t parent_port_number; - grub_efi_uint8_t interface; + grub_efi_uint8_t usb_interface; } __attribute__ ((packed)); typedef struct grub_efi_usb_device_path grub_efi_usb_device_path_t; @@ -1023,8 +1023,8 @@ struct grub_efi_boot_services grub_efi_status_t (*install_protocol_interface) (grub_efi_handle_t *handle, grub_efi_guid_t *protocol, - grub_efi_interface_type_t interface_type, - void *interface); + grub_efi_interface_type_t protocol_interface_type, + void *protocol_interface); grub_efi_status_t (*reinstall_protocol_interface) (grub_efi_handle_t handle, @@ -1035,12 +1035,12 @@ struct grub_efi_boot_services grub_efi_status_t (*uninstall_protocol_interface) (grub_efi_handle_t handle, grub_efi_guid_t *protocol, - void *interface); + void *protocol_interface); grub_efi_status_t (*handle_protocol) (grub_efi_handle_t handle, grub_efi_guid_t *protocol, - void **interface); + void **protocol_interface); void *reserved; @@ -1116,7 +1116,7 @@ struct grub_efi_boot_services grub_efi_status_t (*open_protocol) (grub_efi_handle_t handle, grub_efi_guid_t *protocol, - void **interface, + void **protocol_interface, grub_efi_handle_t agent_handle, grub_efi_handle_t controller_handle, grub_efi_uint32_t attributes); @@ -1148,7 +1148,7 @@ struct grub_efi_boot_services grub_efi_status_t (*locate_protocol) (grub_efi_guid_t *protocol, void *registration, - void **interface); + void **protocol_interface); grub_efi_status_t (*install_multiple_protocol_interfaces) (grub_efi_handle_t *handle, ...);