vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* include/grub/efi/api.h: Rename protocol and interface to avoid

Browse source 
conflict.
This commit is contained in:
Vladimir Serbinenko 2013-12-14 21:48:46 +01:00
parent df6fedcab1
commit 607a39f9f0
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/efi/api.h: Rename protocol and interface to avoid
conflict.
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
* .gitignore: Add .exe variants. Add missing files. Remove few outdated * .gitignore: Add .exe variants. Add missing files. Remove few outdated

2
grub-core/kern/efi/efi.c
View file

@ -558,7 +558,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
grub_memcpy (&usb, dp, len); grub_memcpy (&usb, dp, len);
grub_printf ("/USB(%x,%x)", grub_printf ("/USB(%x,%x)",
(unsigned) usb.parent_port_number, (unsigned) usb.parent_port_number,
(unsigned) usb.interface); (unsigned) usb.usb_interface);
} }
break; break;
case GRUB_EFI_USB_CLASS_DEVICE_PATH_SUBTYPE: case GRUB_EFI_USB_CLASS_DEVICE_PATH_SUBTYPE:

14
include/grub/efi/api.h
View file

@ -716,7 +716,7 @@ struct grub_efi_usb_device_path
{ {
grub_efi_device_path_t header; grub_efi_device_path_t header;
grub_efi_uint8_t parent_port_number; grub_efi_uint8_t parent_port_number;
grub_efi_uint8_t interface; grub_efi_uint8_t usb_interface;
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef struct grub_efi_usb_device_path grub_efi_usb_device_path_t; 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 grub_efi_status_t
(*install_protocol_interface) (grub_efi_handle_t *handle, (*install_protocol_interface) (grub_efi_handle_t *handle,
grub_efi_guid_t *protocol, grub_efi_guid_t *protocol,
grub_efi_interface_type_t interface_type, grub_efi_interface_type_t protocol_interface_type,
void *interface); void *protocol_interface);
grub_efi_status_t grub_efi_status_t
(*reinstall_protocol_interface) (grub_efi_handle_t handle, (*reinstall_protocol_interface) (grub_efi_handle_t handle,
@ -1035,12 +1035,12 @@ struct grub_efi_boot_services
grub_efi_status_t grub_efi_status_t
(*uninstall_protocol_interface) (grub_efi_handle_t handle, (*uninstall_protocol_interface) (grub_efi_handle_t handle,
grub_efi_guid_t *protocol, grub_efi_guid_t *protocol,
void *interface); void *protocol_interface);
grub_efi_status_t grub_efi_status_t
(*handle_protocol) (grub_efi_handle_t handle, (*handle_protocol) (grub_efi_handle_t handle,
grub_efi_guid_t *protocol, grub_efi_guid_t *protocol,
void **interface); void **protocol_interface);
void *reserved; void *reserved;
@ -1116,7 +1116,7 @@ struct grub_efi_boot_services
grub_efi_status_t grub_efi_status_t
(*open_protocol) (grub_efi_handle_t handle, (*open_protocol) (grub_efi_handle_t handle,
grub_efi_guid_t *protocol, grub_efi_guid_t *protocol,
void **interface, void **protocol_interface,
grub_efi_handle_t agent_handle, grub_efi_handle_t agent_handle,
grub_efi_handle_t controller_handle, grub_efi_handle_t controller_handle,
grub_efi_uint32_t attributes); grub_efi_uint32_t attributes);
@ -1148,7 +1148,7 @@ struct grub_efi_boot_services
grub_efi_status_t grub_efi_status_t
(*locate_protocol) (grub_efi_guid_t *protocol, (*locate_protocol) (grub_efi_guid_t *protocol,
void *registration, void *registration,
void **interface); void **protocol_interface);
grub_efi_status_t grub_efi_status_t
(*install_multiple_protocol_interfaces) (grub_efi_handle_t *handle, ...); (*install_multiple_protocol_interfaces) (grub_efi_handle_t *handle, ...);