diff options
author | Michael Brown <mcb30@ipxe.org> | 2014-09-25 12:28:38 +0100 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2014-09-25 12:29:12 +0100 |
commit | 9ee89d0bf16d55682464fdfbb5c01ee6dff7d429 (patch) | |
tree | 889361d08ac31b7aca0244cb154f79b42e6ab368 /src/interface/efi | |
parent | a3d86074ccf154f4439b0c5b7e8c12b1b29fd497 (diff) | |
download | ipxe-9ee89d0bf16d55682464fdfbb5c01ee6dff7d429.tar.gz |
[efi] Centralise definitions of more protocol GUIDs
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/interface/efi')
-rw-r--r-- | src/interface/efi/efi_debug.c | 6 | ||||
-rw-r--r-- | src/interface/efi/efi_guid.c | 14 | ||||
-rw-r--r-- | src/interface/efi/efi_snp.c | 14 | ||||
-rw-r--r-- | src/interface/efi/efi_snp_hii.c | 4 |
4 files changed, 20 insertions, 18 deletions
diff --git a/src/interface/efi/efi_debug.c b/src/interface/efi/efi_debug.c index b6e33491..c6b43e01 100644 --- a/src/interface/efi/efi_debug.c +++ b/src/interface/efi/efi_debug.c @@ -68,6 +68,8 @@ static struct efi_well_known_guid efi_well_known_guids[] = { "DiskIo" }, { &efi_graphics_output_protocol_guid, "GraphicsOutput" }, + { &efi_hii_config_access_protocol_guid, + "HiiConfigAccess" }, { &efi_load_file_protocol_guid, "LoadFile" }, { &efi_load_file2_protocol_guid, @@ -76,6 +78,10 @@ static struct efi_well_known_guid efi_well_known_guids[] = { "LoadedImage" }, { &efi_loaded_image_device_path_protocol_guid, "LoadedImageDevicePath"}, + { &efi_nii_protocol_guid, + "Nii" }, + { &efi_nii31_protocol_guid, + "Nii31" }, { &efi_pci_io_protocol_guid, "PciIo" }, { &efi_pci_root_bridge_io_protocol_guid, diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c index cde28541..458cbb29 100644 --- a/src/interface/efi/efi_guid.c +++ b/src/interface/efi/efi_guid.c @@ -29,9 +29,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/efi/Protocol/DiskIo.h> #include <ipxe/efi/Protocol/DriverBinding.h> #include <ipxe/efi/Protocol/GraphicsOutput.h> +#include <ipxe/efi/Protocol/HiiConfigAccess.h> #include <ipxe/efi/Protocol/LoadFile.h> #include <ipxe/efi/Protocol/LoadFile2.h> #include <ipxe/efi/Protocol/LoadedImage.h> +#include <ipxe/efi/Protocol/NetworkInterfaceIdentifier.h> #include <ipxe/efi/Protocol/PciIo.h> #include <ipxe/efi/Protocol/PciRootBridgeIo.h> #include <ipxe/efi/Protocol/PxeBaseCode.h> @@ -77,6 +79,10 @@ EFI_GUID efi_driver_binding_protocol_guid EFI_GUID efi_graphics_output_protocol_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; +/** HII configuration access protocol GUID */ +EFI_GUID efi_hii_config_access_protocol_guid + = EFI_HII_CONFIG_ACCESS_PROTOCOL_GUID; + /** Load file protocol GUID */ EFI_GUID efi_load_file_protocol_guid = EFI_LOAD_FILE_PROTOCOL_GUID; @@ -93,6 +99,14 @@ EFI_GUID efi_loaded_image_protocol_guid EFI_GUID efi_loaded_image_device_path_protocol_guid = EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID; +/** Network interface identifier protocol GUID (old version) */ +EFI_GUID efi_nii_protocol_guid + = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID; + +/** Network interface identifier protocol GUID (new version) */ +EFI_GUID efi_nii31_protocol_guid + = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID_31; + /** PCI I/O protocol GUID */ EFI_GUID efi_pci_io_protocol_guid = EFI_PCI_IO_PROTOCOL_GUID; diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c index bd45d744..67fba342 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c @@ -35,20 +35,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/efi/efi_snp.h> #include <usr/autoboot.h> -/** EFI network interface identifier GUID */ -static EFI_GUID efi_nii_protocol_guid - = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID; - -/** EFI network interface identifier GUID (extra special version) */ -static EFI_GUID efi_nii31_protocol_guid = { - /* At some point, it seems that someone decided to change the - * GUID. Current EFI builds ignore the older GUID, older EFI - * builds ignore the newer GUID, so we have to expose both. - */ - 0x1ACED566, 0x76ED, 0x4218, - { 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89 } -}; - /** List of SNP devices */ static LIST_HEAD ( efi_snp_devices ); diff --git a/src/interface/efi/efi_snp_hii.c b/src/interface/efi/efi_snp_hii.c index f300de43..c49c76a3 100644 --- a/src/interface/efi/efi_snp_hii.c +++ b/src/interface/efi/efi_snp_hii.c @@ -60,10 +60,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/efi/efi_snp.h> #include <ipxe/efi/efi_strings.h> -/** EFI configuration access protocol GUID */ -static EFI_GUID efi_hii_config_access_protocol_guid - = EFI_HII_CONFIG_ACCESS_PROTOCOL_GUID; - /** EFI platform setup formset GUID */ static EFI_GUID efi_hii_platform_setup_formset_guid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID; |