efi_loader: signature of StartImage and Exit
We use u16* for Unicode strings and efi_uintn_t for UINTN. Correct the
signature of efi_exit() and efi_start_image().
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
diff --git a/include/efi_api.h b/include/efi_api.h
index 0e5c6e9..4389dbe 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -115,11 +115,11 @@
struct efi_device_path *file_path, void *source_buffer,
efi_uintn_t source_size, efi_handle_t *image);
efi_status_t (EFIAPI *start_image)(efi_handle_t handle,
- unsigned long *exitdata_size,
- s16 **exitdata);
+ efi_uintn_t *exitdata_size,
+ u16 **exitdata);
efi_status_t (EFIAPI *exit)(efi_handle_t handle,
efi_status_t exit_status,
- unsigned long exitdata_size, s16 *exitdata);
+ efi_uintn_t exitdata_size, u16 *exitdata);
efi_status_t (EFIAPI *unload_image)(efi_handle_t image_handle);
efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t, unsigned long);
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index f592e40..88386ff 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -1706,8 +1706,8 @@
* Return: status code
*/
static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,
- unsigned long *exit_data_size,
- s16 **exit_data)
+ efi_uintn_t *exit_data_size,
+ u16 **exit_data)
{
struct efi_loaded_image_obj *image_obj =
(struct efi_loaded_image_obj *)image_handle;
@@ -1773,8 +1773,8 @@
*/
static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
efi_status_t exit_status,
- unsigned long exit_data_size,
- int16_t *exit_data)
+ efi_uintn_t exit_data_size,
+ u16 *exit_data)
{
/*
* TODO: We should call the unload procedure of the loaded
@@ -1783,7 +1783,7 @@
struct efi_loaded_image_obj *image_obj =
(struct efi_loaded_image_obj *)image_handle;
- EFI_ENTRY("%p, %ld, %ld, %p", image_handle, exit_status,
+ EFI_ENTRY("%p, %ld, %zu, %p", image_handle, exit_status,
exit_data_size, exit_data);
/* Make sure entry/exit counts for EFI world cross-overs match */