Browse Source

[efi] Centralise EFI file system info GUIDs

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 8 years ago
parent
commit
e3012f9949
3 changed files with 11 additions and 6 deletions
  1. 3
    0
      src/include/ipxe/efi/efi.h
  2. 0
    6
      src/interface/efi/efi_file.c
  3. 8
    0
      src/interface/efi/efi_guid.c

+ 3
- 0
src/include/ipxe/efi/efi.h View File

@@ -205,6 +205,9 @@ extern EFI_GUID efi_usb2_hc_protocol_guid;
205 205
 extern EFI_GUID efi_usb_io_protocol_guid;
206 206
 extern EFI_GUID efi_vlan_config_protocol_guid;
207 207
 
208
+extern EFI_GUID efi_file_info_id;
209
+extern EFI_GUID efi_file_system_info_id;
210
+
208 211
 extern EFI_HANDLE efi_image_handle;
209 212
 extern EFI_LOADED_IMAGE_PROTOCOL *efi_loaded_image;
210 213
 extern EFI_DEVICE_PATH_PROTOCOL *efi_loaded_image_path;

+ 0
- 6
src/interface/efi/efi_file.c View File

@@ -47,12 +47,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
47 47
 #include <ipxe/efi/efi_strings.h>
48 48
 #include <ipxe/efi/efi_file.h>
49 49
 
50
-/** EFI file information GUID */
51
-static EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID;
52
-
53
-/** EFI file system information GUID */
54
-static EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID;
55
-
56 50
 /** EFI media ID */
57 51
 #define EFI_MEDIA_ID_MAGIC 0x69505845
58 52
 

+ 8
- 0
src/interface/efi/efi_guid.c View File

@@ -66,6 +66,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
66 66
 #include <ipxe/efi/Protocol/Usb2HostController.h>
67 67
 #include <ipxe/efi/Protocol/UsbIo.h>
68 68
 #include <ipxe/efi/Protocol/VlanConfig.h>
69
+#include <ipxe/efi/Guid/FileInfo.h>
70
+#include <ipxe/efi/Guid/FileSystemInfo.h>
69 71
 
70 72
 /** @file
71 73
  *
@@ -281,3 +283,9 @@ EFI_GUID efi_usb_io_protocol_guid
281 283
 /** VLAN configuration protocol GUID */
282 284
 EFI_GUID efi_vlan_config_protocol_guid
283 285
 	= EFI_VLAN_CONFIG_PROTOCOL_GUID;
286
+
287
+/** File information GUID */
288
+EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID;
289
+
290
+/** File system information GUID */
291
+EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID;

Loading…
Cancel
Save