LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: simplify efi_get_device_path_text() 

Replace static function efi_get_device_handle_info() by a simplified
function efi_get_device_path_text() avoiding EFI_CALL().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2021-04-02 11:30:02 +02:00
parent 59ffe0e339
commit d473063d9d
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/efidebug.c
View File

@ -341,27 +341,27 @@ static int do_efi_capsule(struct cmd_tbl *cmdtp, int flag,
#endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT */ #endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT */
/** /**
* efi_get_device_handle_info() - get information of UEFI device * efi_get_device_path_text() - get device path text
* *
* @handle: Handle of UEFI device * Return the text representation of the device path of a handle.
* @dev_path_text: Pointer to text of device path
* Return: 0 on success, -1 on failure
* *
* Currently return a formatted text of device path. * @handle: handle of UEFI device
* Return:
* Pointer to the device path text or NULL.
* The caller is responsible for calling FreePool().
*/ */
static int efi_get_device_handle_info(efi_handle_t handle, u16 **dev_path_text) static u16 *efi_get_device_path_text(efi_handle_t handle)
{ {
struct efi_device_path *dp; struct efi_handler *handler;
efi_status_t ret; efi_status_t ret;
ret = EFI_CALL(BS->open_protocol(handle, &efi_guid_device_path, ret = efi_search_protocol(handle, &efi_guid_device_path, &handler);
(void **)&dp, NULL /* FIXME */, NULL, if (ret == EFI_SUCCESS && handler->protocol_interface) {
EFI_OPEN_PROTOCOL_GET_PROTOCOL)); struct efi_device_path *dp = handler->protocol_interface;
if (ret == EFI_SUCCESS) {
*dev_path_text = efi_dp_str(dp); return efi_dp_str(dp);
return 0;
} else { } else {
return -1; return NULL;
} }
} }
@ -401,7 +401,8 @@ static int do_efi_show_devices(struct cmd_tbl *cmdtp, int flag,
printf("Device%.*s Device Path\n", EFI_HANDLE_WIDTH - 6, spc); printf("Device%.*s Device Path\n", EFI_HANDLE_WIDTH - 6, spc);
printf("%.*s ====================\n", EFI_HANDLE_WIDTH, sep); printf("%.*s ====================\n", EFI_HANDLE_WIDTH, sep);
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (!efi_get_device_handle_info(handles[i], &dev_path_text)) { dev_path_text = efi_get_device_path_text(handles[i]);
if (dev_path_text) {
printf("%p %ls\n", handles[i], dev_path_text); printf("%p %ls\n", handles[i], dev_path_text);
efi_free_pool(dev_path_text); efi_free_pool(dev_path_text);
} }