diff options
| author | Michael Brown | 2015-12-09 18:35:24 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-12-09 18:36:08 +0100 |
| commit | e3012f99492cc6be331f3f740e5a38e7920bc42c (patch) | |
| tree | 9889989fa893a251e98f04dd0fff28326dc5abe6 /src | |
| parent | [xhci] Ensure that zero-length packets are not part of a TRB chain (diff) | |
| download | ipxe-e3012f99492cc6be331f3f740e5a38e7920bc42c.tar.gz ipxe-e3012f99492cc6be331f3f740e5a38e7920bc42c.tar.xz ipxe-e3012f99492cc6be331f3f740e5a38e7920bc42c.zip | |
[efi] Centralise EFI file system info GUIDs
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ipxe/efi/efi.h | 3 | ||||
| -rw-r--r-- | src/interface/efi/efi_file.c | 6 | ||||
| -rw-r--r-- | src/interface/efi/efi_guid.c | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/include/ipxe/efi/efi.h b/src/include/ipxe/efi/efi.h index 40d3beb1..390d4e6e 100644 --- a/src/include/ipxe/efi/efi.h +++ b/src/include/ipxe/efi/efi.h @@ -205,6 +205,9 @@ extern EFI_GUID efi_usb2_hc_protocol_guid; extern EFI_GUID efi_usb_io_protocol_guid; extern EFI_GUID efi_vlan_config_protocol_guid; +extern EFI_GUID efi_file_info_id; +extern EFI_GUID efi_file_system_info_id; + extern EFI_HANDLE efi_image_handle; extern EFI_LOADED_IMAGE_PROTOCOL *efi_loaded_image; extern EFI_DEVICE_PATH_PROTOCOL *efi_loaded_image_path; diff --git a/src/interface/efi/efi_file.c b/src/interface/efi/efi_file.c index 05eadc97..52de0987 100644 --- a/src/interface/efi/efi_file.c +++ b/src/interface/efi/efi_file.c @@ -47,12 +47,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/efi/efi_strings.h> #include <ipxe/efi/efi_file.h> -/** EFI file information GUID */ -static EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID; - -/** EFI file system information GUID */ -static EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID; - /** EFI media ID */ #define EFI_MEDIA_ID_MAGIC 0x69505845 diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c index 8ec5e541..39da5efe 100644 --- a/src/interface/efi/efi_guid.c +++ b/src/interface/efi/efi_guid.c @@ -66,6 +66,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/efi/Protocol/Usb2HostController.h> #include <ipxe/efi/Protocol/UsbIo.h> #include <ipxe/efi/Protocol/VlanConfig.h> +#include <ipxe/efi/Guid/FileInfo.h> +#include <ipxe/efi/Guid/FileSystemInfo.h> /** @file * @@ -281,3 +283,9 @@ EFI_GUID efi_usb_io_protocol_guid /** VLAN configuration protocol GUID */ EFI_GUID efi_vlan_config_protocol_guid = EFI_VLAN_CONFIG_PROTOCOL_GUID; + +/** File information GUID */ +EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID; + +/** File system information GUID */ +EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID; |