[syslinux:master] efi: rename pxe_handle to image_device_handle

[syslinux-bot for Gene Cumm]

Commit-ID:  8702009fc7a6689432d17d4ea05d9c878452c57a
Gitweb:     http://www.syslinux.org/commit/8702009fc7a6689432d17d4ea05d9c878452c57a
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Sun, 19 Jul 2015 08:09:10 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Sun, 19 Jul 2015 08:09:10 -0400

efi: rename pxe_handle to image_device_handle

Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

---
 efi/efi.h  |  2 +-
 efi/main.c | 14 +++++++-------
 efi/pxe.c  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/efi/efi.h b/efi/efi.h
index 1416488..c266532 100644
--- a/efi/efi.h
+++ b/efi/efi.h
@@ -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 *);
diff --git a/efi/main.c b/efi/main.c
index adfa98b..9c3c2f2 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -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;
@@ -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;
@@ -83,8 +83,8 @@ destroy_child:
     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);
@@ -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)
 {
@@ -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 */
diff --git a/efi/pxe.c b/efi/pxe.c
index df28d24..4300947 100644
--- a/efi/pxe.c
+++ b/efi/pxe.c
@@ -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");