mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-03 01:23:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: signature of StartImage and Exit

Browse Source 
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>
This commit is contained in:
Heinrich Schuchardt 2018-12-28 12:41:15 +01:00 committed by Alexander Graf
parent c6d876fa2d
commit cc8e34178b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/efi_api.h
View File

@ -115,11 +115,11 @@ struct efi_boot_services {
struct efi_device_path *file_path, void *source_buffer, struct efi_device_path *file_path, void *source_buffer,
efi_uintn_t source_size, efi_handle_t *image); efi_uintn_t source_size, efi_handle_t *image);
efi_status_t (EFIAPI *start_image)(efi_handle_t handle, efi_status_t (EFIAPI *start_image)(efi_handle_t handle,
unsigned long *exitdata_size, efi_uintn_t *exitdata_size,
s16 **exitdata); u16 **exitdata);
efi_status_t (EFIAPI *exit)(efi_handle_t handle, efi_status_t (EFIAPI *exit)(efi_handle_t handle,
efi_status_t exit_status, 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 *unload_image)(efi_handle_t image_handle);
efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t, unsigned long); efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t, unsigned long);

10
lib/efi_loader/efi_boottime.c
View File

@ -1706,8 +1706,8 @@ error:
* Return: status code * Return: status code
*/ */
static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,
unsigned long *exit_data_size, efi_uintn_t *exit_data_size,
s16 **exit_data) u16 **exit_data)
{ {
struct efi_loaded_image_obj *image_obj = struct efi_loaded_image_obj *image_obj =
(struct efi_loaded_image_obj *)image_handle; (struct efi_loaded_image_obj *)image_handle;
@ -1773,8 +1773,8 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,
*/ */
static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
efi_status_t exit_status, efi_status_t exit_status,
unsigned long exit_data_size, efi_uintn_t exit_data_size,
int16_t *exit_data) u16 *exit_data)
{ {
/* /*
* TODO: We should call the unload procedure of the loaded * TODO: We should call the unload procedure of the loaded
@ -1783,7 +1783,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
struct efi_loaded_image_obj *image_obj = struct efi_loaded_image_obj *image_obj =
(struct efi_loaded_image_obj *)image_handle; (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); exit_data_size, exit_data);
/* Make sure entry/exit counts for EFI world cross-overs match */ /* Make sure entry/exit counts for EFI world cross-overs match */