From 9fdca5bbe11e384198372b86a6b81d5d9e79fa16 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 28 Sep 2017 14:11:51 -0400 Subject: Don't use uefi_call_wrapper(), ever. I'm pretty done with typing uefi_call_wrapper() and counting arguments every time. Instead, just make the compiler error if we don't have ms_abi. Also, make it so nothing can use uefi_call_wrapper() directly. Signed-off-by: Peter Jones --- lib/execute.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'lib/execute.c') diff --git a/lib/execute.c b/lib/execute.c index 7bd775fa..366af3c8 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -101,23 +101,21 @@ execute(EFI_HANDLE image, CHAR16 *name) EFI_DEVICE_PATH *devpath; CHAR16 *PathName; - efi_status = uefi_call_wrapper(BS->HandleProtocol, 3, image, - &IMAGE_PROTOCOL, (void **)&li); + efi_status = gBS->HandleProtocol(image, &IMAGE_PROTOCOL, + (void **) &li); if (EFI_ERROR(efi_status)) return efi_status; - efi_status = generate_path(name, li, &devpath, &PathName); if (EFI_ERROR(efi_status)) return efi_status; - efi_status = uefi_call_wrapper(BS->LoadImage, 6, FALSE, image, - devpath, NULL, 0, &h); + efi_status = gBS->LoadImage(FALSE, image, devpath, NULL, 0, &h); if (EFI_ERROR(efi_status)) goto out; - efi_status = uefi_call_wrapper(BS->StartImage, 3, h, NULL, NULL); - uefi_call_wrapper(BS->UnloadImage, 1, h); + efi_status = gBS->StartImage(h, NULL, NULL); + gBS->UnloadImage(h); out: FreePool(PathName); -- cgit v1.2.3