GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi: Fix missing EFIAPI specifiers

Browse source 
These are missing in some functions. Add them to keep things consistent.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Simon Glass 2016-09-25 15:27:32 -06:00 • committed by Alexander Graf
parent a0b49bc334
commit e275458c2f
5 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/bootefi.c
View file

@ -15,6 +15,8 @@
#include <libfdt_env.h> #include <libfdt_env.h>
#include <memalign.h> #include <memalign.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm-generic/sections.h>
#include <linux/linkage.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -52,7 +54,7 @@ static struct efi_device_path_file_path bootefi_device_path[] = {
} }
}; };
static efi_status_t bootefi_open_dp(void *handle, efi_guid_t *protocol, static efi_status_t EFIAPI bootefi_open_dp(void *handle, efi_guid_t *protocol,
void **protocol_interface, void *agent_handle, void **protocol_interface, void *agent_handle,
void *controller_handle, uint32_t attributes) void *controller_handle, uint32_t attributes)
{ {
@ -145,7 +147,8 @@ static void *copy_fdt(void *fdt)
*/ */
static unsigned long do_bootefi_exec(void *efi, void *fdt) static unsigned long do_bootefi_exec(void *efi, void *fdt)
{ {
ulong (*entry)(void *image_handle, struct efi_system_table *st); ulong (*entry)(void *image_handle, struct efi_system_table *st)
asmlinkage;
ulong fdt_pages, fdt_size, fdt_start, fdt_end; ulong fdt_pages, fdt_size, fdt_start, fdt_end;
bootm_headers_t img = { 0 }; bootm_headers_t img = { 0 };

2
include/efi_loader.h
View file

@ -95,7 +95,7 @@ void efi_net_set_dhcp_ack(void *pkt, int len);
* Stub implementation for a protocol opener that just returns the handle as * Stub implementation for a protocol opener that just returns the handle as
* interface * interface
*/ */
efi_status_t efi_return_handle(void *handle, efi_status_t EFIAPI efi_return_handle(void *handle,
efi_guid_t *protocol, void **protocol_interface, efi_guid_t *protocol, void **protocol_interface,
void *agent_handle, void *controller_handle, void *agent_handle, void *controller_handle,
uint32_t attributes); uint32_t attributes);

5
lib/efi_loader/efi_boottime.c
View file

@ -160,7 +160,7 @@ static struct {
u32 trigger_time; u32 trigger_time;
u64 trigger_next; u64 trigger_next;
unsigned long notify_tpl; unsigned long notify_tpl;
void (*notify_function) (void *event, void *context); void (EFIAPI *notify_function) (void *event, void *context);
void *notify_context; void *notify_context;
} efi_event = { } efi_event = {
/* Disable timers on bootup */ /* Disable timers on bootup */
@ -169,7 +169,8 @@ static struct {
static efi_status_t EFIAPI efi_create_event( static efi_status_t EFIAPI efi_create_event(
enum efi_event_type type, ulong notify_tpl, enum efi_event_type type, ulong notify_tpl,
void (*notify_function) (void *event, void *context), void (EFIAPI *notify_function) (void *event,
void *context),
void *notify_context, void **event) void *notify_context, void **event)
{ {
EFI_ENTRY("%d, 0x%lx, %p, %p", type, notify_tpl, notify_function, EFI_ENTRY("%d, 0x%lx, %p, %p", type, notify_tpl, notify_function,

13
lib/efi_loader/efi_disk.c
View file

@ -35,9 +35,10 @@ struct efi_disk_obj {
const struct blk_desc *desc; const struct blk_desc *desc;
}; };
static efi_status_t efi_disk_open_block(void *handle, efi_guid_t *protocol, static efi_status_t EFIAPI efi_disk_open_block(void *handle,
void **protocol_interface, void *agent_handle, efi_guid_t *protocol, void **protocol_interface,
void *controller_handle, uint32_t attributes) void *agent_handle, void *controller_handle,
uint32_t attributes)
{ {
struct efi_disk_obj *diskobj = handle; struct efi_disk_obj *diskobj = handle;
@ -46,7 +47,7 @@ static efi_status_t efi_disk_open_block(void *handle, efi_guid_t *protocol,
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t efi_disk_open_dp(void *handle, efi_guid_t *protocol, static efi_status_t EFIAPI efi_disk_open_dp(void *handle, efi_guid_t *protocol,
void **protocol_interface, void *agent_handle, void **protocol_interface, void *agent_handle,
void *controller_handle, uint32_t attributes) void *controller_handle, uint32_t attributes)
{ {
@ -108,7 +109,7 @@ static efi_status_t EFIAPI efi_disk_rw_blocks(struct efi_block_io *this,
return EFI_EXIT(EFI_SUCCESS); return EFI_EXIT(EFI_SUCCESS);
} }
static efi_status_t efi_disk_read_blocks(struct efi_block_io *this, static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this,
u32 media_id, u64 lba, unsigned long buffer_size, u32 media_id, u64 lba, unsigned long buffer_size,
void *buffer) void *buffer)
{ {
@ -143,7 +144,7 @@ static efi_status_t efi_disk_read_blocks(struct efi_block_io *this,
return EFI_EXIT(r); return EFI_EXIT(r);
} }
static efi_status_t efi_disk_write_blocks(struct efi_block_io *this, static efi_status_t EFIAPI efi_disk_write_blocks(struct efi_block_io *this,
u32 media_id, u64 lba, unsigned long buffer_size, u32 media_id, u64 lba, unsigned long buffer_size,
void *buffer) void *buffer)
{ {

4
lib/efi_loader/efi_net.c
View file

@ -198,7 +198,7 @@ static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
return EFI_EXIT(EFI_SUCCESS); return EFI_EXIT(EFI_SUCCESS);
} }
static efi_status_t efi_net_open_dp(void *handle, efi_guid_t *protocol, static efi_status_t EFIAPI efi_net_open_dp(void *handle, efi_guid_t *protocol,
void **protocol_interface, void *agent_handle, void **protocol_interface, void *agent_handle,
void *controller_handle, uint32_t attributes) void *controller_handle, uint32_t attributes)
{ {
@ -210,7 +210,7 @@ static efi_status_t efi_net_open_dp(void *handle, efi_guid_t *protocol,
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t efi_net_open_pxe(void *handle, efi_guid_t *protocol, static efi_status_t EFIAPI efi_net_open_pxe(void *handle, efi_guid_t *protocol,
void **protocol_interface, void *agent_handle, void **protocol_interface, void *agent_handle,
void *controller_handle, uint32_t attributes) void *controller_handle, uint32_t attributes)
{ {