Author: tsoome
Date: Mon Dec 2 09:57:07 2019
New Revision: 355284
URL: https://svnweb.freebsd.org/changeset/base/355284
Log:
r353501 did mimerge r350654 boot1 and gptboot were left out
Replace left over BS->HandleProtocol by OpenProtocolByHandle.
Reported by: Harry Schmalzbauer
Modified:
stable/12/stand/efi/boot1/proto.c
stable/12/stand/efi/gptboot/proto.c
Modified: stable/12/stand/efi/boot1/proto.c
==============================================================================
--- stable/12/stand/efi/boot1/proto.c Mon Dec 2 07:39:55 2019
(r355283)
+++ stable/12/stand/efi/boot1/proto.c Mon Dec 2 09:57:07 2019
(r355284)
@@ -61,7 +61,7 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath)
int preferred;
/* Figure out if we're dealing with an actual partition. */
- status = BS->HandleProtocol(h, &DevicePathGUID, (void **)&devpath);
+ status = OpenProtocolByHandle(h, &DevicePathGUID, (void **)&devpath);
if (status == EFI_UNSUPPORTED)
return (0);
@@ -77,7 +77,7 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath)
efi_free_devpath_name(text);
}
#endif
- status = BS->HandleProtocol(h, &BlockIoProtocolGUID, (void **)&blkio);
+ status = OpenProtocolByHandle(h, &BlockIoProtocolGUID, (void **)&blkio);
if (status == EFI_UNSUPPORTED)
return (0);
Modified: stable/12/stand/efi/gptboot/proto.c
==============================================================================
--- stable/12/stand/efi/gptboot/proto.c Mon Dec 2 07:39:55 2019
(r355283)
+++ stable/12/stand/efi/gptboot/proto.c Mon Dec 2 09:57:07 2019
(r355284)
@@ -146,7 +146,7 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath)
EFI_STATUS status;
/* Figure out if we're dealing with an actual partition. */
- status = BS->HandleProtocol(h, &DevicePathGUID, (void **)&devpath);
+ status = OpenProtocolByHandle(h, &DevicePathGUID, (void **)&devpath);
if (status != EFI_SUCCESS)
return;
#ifdef EFI_DEBUG
@@ -169,7 +169,7 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath)
return;
}
}
- status = BS->HandleProtocol(h, &BlockIoProtocolGUID, (void **)&blkio);
+ status = OpenProtocolByHandle(h, &BlockIoProtocolGUID, (void **)&blkio);
if (status != EFI_SUCCESS) {
DPRINTF("Can't get the block I/O protocol block\n");
return;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
