narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[efi] Centralise EFI file system info GUIDs 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/43/head
Michael Brown 2015-12-09 17:35:24 +00:00
parent ee8388ec69
commit e3012f9949
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/ipxe/efi/efi.h
View File

@ -205,6 +205,9 @@ extern EFI_GUID efi_usb2_hc_protocol_guid;
extern EFI_GUID efi_usb_io_protocol_guid; extern EFI_GUID efi_usb_io_protocol_guid;
extern EFI_GUID efi_vlan_config_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_HANDLE efi_image_handle;
extern EFI_LOADED_IMAGE_PROTOCOL *efi_loaded_image; extern EFI_LOADED_IMAGE_PROTOCOL *efi_loaded_image;
extern EFI_DEVICE_PATH_PROTOCOL *efi_loaded_image_path; extern EFI_DEVICE_PATH_PROTOCOL *efi_loaded_image_path;

6
src/interface/efi/efi_file.c
View File

@ -47,12 +47,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <ipxe/efi/efi_strings.h> #include <ipxe/efi/efi_strings.h>
#include <ipxe/efi/efi_file.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 */ /** EFI media ID */
#define EFI_MEDIA_ID_MAGIC 0x69505845 #define EFI_MEDIA_ID_MAGIC 0x69505845

8
src/interface/efi/efi_guid.c
View File

@ -66,6 +66,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <ipxe/efi/Protocol/Usb2HostController.h> #include <ipxe/efi/Protocol/Usb2HostController.h>
#include <ipxe/efi/Protocol/UsbIo.h> #include <ipxe/efi/Protocol/UsbIo.h>
#include <ipxe/efi/Protocol/VlanConfig.h> #include <ipxe/efi/Protocol/VlanConfig.h>
#include <ipxe/efi/Guid/FileInfo.h>
#include <ipxe/efi/Guid/FileSystemInfo.h>
/** @file /** @file
* *
@ -281,3 +283,9 @@ EFI_GUID efi_usb_io_protocol_guid
/** VLAN configuration protocol GUID */ /** VLAN configuration protocol GUID */
EFI_GUID efi_vlan_config_protocol_guid EFI_GUID efi_vlan_config_protocol_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;