mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-12-16 15:02:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

efi_loader: refactor efi_install_protocol_interface

Browse Source 
For the implementation of InstallMultipleProtocolInterfaces we
need to call efi_install_protocol_interface. In internal calls
we should not pass through EFI_EXIT.

The patch introduces a wrapper function
efi_install_protocol_interface_ext.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
xypron.glpk@gmx.de 2017-07-11 22:06:18 +02:00 committed by Alexander Graf
parent 4b6ed0d7a1
commit 8bee5a3c13
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/efi_loader/efi_boottime.c
View File

@ -307,9 +307,6 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle,
int i; int i;
efi_status_t r; efi_status_t r;
EFI_ENTRY("%p, %p, %d, %p", handle, protocol, protocol_interface_type,
protocol_interface);
if (!handle || !protocol || if (!handle || !protocol ||
protocol_interface_type != EFI_NATIVE_INTERFACE) { protocol_interface_type != EFI_NATIVE_INTERFACE) {
r = EFI_INVALID_PARAMETER; r = EFI_INVALID_PARAMETER;
@ -356,7 +353,19 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle,
} }
r = EFI_INVALID_PARAMETER; r = EFI_INVALID_PARAMETER;
out: out:
return EFI_EXIT(r); return r;
}
static efi_status_t EFIAPI efi_install_protocol_interface_ext(void **handle,
efi_guid_t *protocol, int protocol_interface_type,
void *protocol_interface)
{
EFI_ENTRY("%p, %p, %d, %p", handle, protocol, protocol_interface_type,
protocol_interface);
return EFI_EXIT(efi_install_protocol_interface(handle, protocol,
protocol_interface_type,
protocol_interface));
} }
static efi_status_t EFIAPI efi_reinstall_protocol_interface(void *handle, static efi_status_t EFIAPI efi_reinstall_protocol_interface(void *handle,
@ -894,7 +903,7 @@ static const struct efi_boot_services efi_boot_services = {
.signal_event = efi_signal_event, .signal_event = efi_signal_event,
.close_event = efi_close_event, .close_event = efi_close_event,
.check_event = efi_check_event, .check_event = efi_check_event,
.install_protocol_interface = efi_install_protocol_interface, .install_protocol_interface = efi_install_protocol_interface_ext,
.reinstall_protocol_interface = efi_reinstall_protocol_interface, .reinstall_protocol_interface = efi_reinstall_protocol_interface,
.uninstall_protocol_interface = efi_uninstall_protocol_interface, .uninstall_protocol_interface = efi_uninstall_protocol_interface,
.handle_protocol = efi_handle_protocol, .handle_protocol = efi_handle_protocol,