Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
efi: rename pxe_handle to image_device_handle
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
  • Loading branch information
geneC committed Jul 19, 2015
1 parent f3f6971 commit 8702009
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion efi/efi.h
Expand Up @@ -42,7 +42,7 @@ struct efi_binding {
EFI_HANDLE this;
};

extern EFI_HANDLE image_handle, pxe_handle;
extern EFI_HANDLE image_handle, image_device_handle;

struct screen_info;
extern void setup_screen(struct screen_info *);
Expand Down
14 changes: 7 additions & 7 deletions efi/main.c
Expand Up @@ -52,9 +52,9 @@ struct efi_binding *efi_create_binding(EFI_GUID *bguid, EFI_GUID *pguid)
if (!b)
return NULL;

status = uefi_call_wrapper(BS->OpenProtocol, 6, pxe_handle,
status = uefi_call_wrapper(BS->OpenProtocol, 6, image_device_handle,
bguid, (void **)&sbp,
image_handle, pxe_handle,
image_handle, image_device_handle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL);
if (status != EFI_SUCCESS)
goto free_binding;
Expand All @@ -72,7 +72,7 @@ struct efi_binding *efi_create_binding(EFI_GUID *bguid, EFI_GUID *pguid)
if (status != EFI_SUCCESS)
goto destroy_child;

b->parent = pxe_handle;
b->parent = image_device_handle;
b->binding = sbp;
b->child = child;
b->this = protocol;
Expand All @@ -83,8 +83,8 @@ struct efi_binding *efi_create_binding(EFI_GUID *bguid, EFI_GUID *pguid)
uefi_call_wrapper(sbp->DestroyChild, 2, sbp, child);

close_protocol:
uefi_call_wrapper(BS->CloseProtocol, 4, pxe_handle, bguid,
image_handle, pxe_handle);
uefi_call_wrapper(BS->CloseProtocol, 4, image_device_handle, bguid,
image_handle, image_device_handle);

free_binding:
free(b);
Expand Down Expand Up @@ -442,7 +442,7 @@ get_mem_desc(unsigned long memmap, UINTN desc_sz, int i)
return (EFI_MEMORY_DESCRIPTOR *)(memmap + (i * desc_sz));
}

EFI_HANDLE image_handle, pxe_handle;
EFI_HANDLE image_handle, image_device_handle, mnpsb_handle;

static inline UINT64 round_up(UINT64 x, UINT64 y)
{
Expand Down Expand Up @@ -1283,7 +1283,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *table)
} else {
efi_derivative(SYSLINUX_FS_PXELINUX);
ops[0] = &pxe_fs_ops;
pxe_handle = info->DeviceHandle;
image_device_handle = info->DeviceHandle;
}

/* setup timer for boot menu system support */
Expand Down
2 changes: 1 addition & 1 deletion efi/pxe.c
Expand Up @@ -98,7 +98,7 @@ void net_parse_dhcp(void)
char dst[256];
UINTN i = 0;

status = uefi_call_wrapper(BS->HandleProtocol, 3, pxe_handle,
status = uefi_call_wrapper(BS->HandleProtocol, 3, image_device_handle,
&PxeBaseCodeProtocol, (void **)&bc);
if (status != EFI_SUCCESS) {
Print(L"Failed to lookup PxeBaseCodeProtocol\n");
Expand Down

0 comments on commit 8702009

Please sign in to comment.