From c8a96482e2a7129323f3bd2ec862f3836d66943f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 29 Mar 2026 15:18:48 +0100 Subject: [PATCH] [efi] Update to current EDK2 headers Signed-off-by: Michael Brown --- src/include/ipxe/efi/AArch64/ProcessorBind.h | 16 +++++--- src/include/ipxe/efi/Base.h | 5 +-- src/include/ipxe/efi/Guid/Acpi.h | 5 +-- src/include/ipxe/efi/Guid/Fdt.h | 5 +-- src/include/ipxe/efi/Guid/FileInfo.h | 5 +-- src/include/ipxe/efi/Guid/FileSystemInfo.h | 5 +-- src/include/ipxe/efi/Guid/GlobalVariable.h | 5 +-- .../ipxe/efi/Guid/HiiFormMapMethodGuid.h | 5 +-- .../ipxe/efi/Guid/HiiPlatformSetupFormset.h | 5 +-- .../ipxe/efi/Guid/ImageAuthentication.h | 5 +-- src/include/ipxe/efi/Guid/MdeModuleHii.h | 5 +-- src/include/ipxe/efi/Guid/MicrosoftVendor.h | 5 +-- src/include/ipxe/efi/Guid/PcAnsi.h | 5 +-- src/include/ipxe/efi/Guid/Rng.h | 5 +-- src/include/ipxe/efi/Guid/SmBios.h | 5 +-- src/include/ipxe/efi/Guid/TlsAuthentication.h | 5 +-- src/include/ipxe/efi/Guid/WinCertificate.h | 5 +-- src/include/ipxe/efi/Ia32/ProcessorBind.h | 5 +-- .../ipxe/efi/IndustryStandard/Acpi10.h | 5 +-- .../ipxe/efi/IndustryStandard/Acpi20.h | 5 +-- .../ipxe/efi/IndustryStandard/Acpi30.h | 5 +-- .../ipxe/efi/IndustryStandard/Acpi40.h | 5 +-- .../ipxe/efi/IndustryStandard/Acpi50.h | 9 ++--- .../ipxe/efi/IndustryStandard/Acpi51.h | 9 ++--- .../ipxe/efi/IndustryStandard/Acpi60.h | 9 ++--- .../ipxe/efi/IndustryStandard/AcpiAml.h | 9 +++-- .../ipxe/efi/IndustryStandard/Bluetooth.h | 5 +-- src/include/ipxe/efi/IndustryStandard/Pci22.h | 5 +-- .../ipxe/efi/IndustryStandard/PeImage.h | 5 +-- src/include/ipxe/efi/IndustryStandard/Tpm12.h | 5 +-- src/include/ipxe/efi/IndustryStandard/Tpm20.h | 5 +-- .../efi/IndustryStandard/UefiTcgPlatform.h | 5 +-- src/include/ipxe/efi/IndustryStandard/Usb.h | 5 +-- src/include/ipxe/efi/Library/BaseLib.h | 40 +++++++++++++++++-- .../ipxe/efi/LoongArch64/ProcessorBind.h | 5 +-- src/include/ipxe/efi/Pi/PiBootMode.h | 5 +-- src/include/ipxe/efi/Pi/PiDependency.h | 5 +-- src/include/ipxe/efi/Pi/PiDxeCis.h | 5 +-- src/include/ipxe/efi/Pi/PiFirmwareFile.h | 10 +++-- src/include/ipxe/efi/Pi/PiFirmwareVolume.h | 6 ++- src/include/ipxe/efi/Pi/PiHob.h | 5 +-- src/include/ipxe/efi/Pi/PiMultiPhase.h | 5 +-- src/include/ipxe/efi/Pi/PiS3BootScript.h | 5 +-- src/include/ipxe/efi/Pi/PiStatusCode.h | 5 +-- src/include/ipxe/efi/PiDxe.h | 5 +-- .../ipxe/efi/Protocol/AbsolutePointer.h | 5 +-- src/include/ipxe/efi/Protocol/AcpiTable.h | 5 +-- .../ipxe/efi/Protocol/AdapterInformation.h | 5 +-- src/include/ipxe/efi/Protocol/Arp.h | 5 +-- src/include/ipxe/efi/Protocol/BlockIo.h | 5 +-- src/include/ipxe/efi/Protocol/BlockIo2.h | 5 +-- .../efi/Protocol/BusSpecificDriverOverride.h | 5 +-- src/include/ipxe/efi/Protocol/ComponentName.h | 5 +-- .../ipxe/efi/Protocol/ComponentName2.h | 5 +-- src/include/ipxe/efi/Protocol/DebugSupport.h | 5 +-- src/include/ipxe/efi/Protocol/DevicePath.h | 5 +-- .../ipxe/efi/Protocol/DevicePathToText.h | 5 +-- src/include/ipxe/efi/Protocol/Dhcp4.h | 5 +-- src/include/ipxe/efi/Protocol/Dhcp6.h | 5 +-- src/include/ipxe/efi/Protocol/DiskIo.h | 5 +-- src/include/ipxe/efi/Protocol/Dns4.h | 5 +-- src/include/ipxe/efi/Protocol/Dns6.h | 5 +-- src/include/ipxe/efi/Protocol/DriverBinding.h | 5 +-- .../ipxe/efi/Protocol/EapConfiguration.h | 5 +-- src/include/ipxe/efi/Protocol/FormBrowser2.h | 5 +-- .../ipxe/efi/Protocol/GraphicsOutput.h | 5 +-- src/include/ipxe/efi/Protocol/Hash.h | 5 +-- .../ipxe/efi/Protocol/HiiConfigAccess.h | 5 +-- src/include/ipxe/efi/Protocol/HiiDatabase.h | 5 +-- src/include/ipxe/efi/Protocol/HiiFont.h | 5 +-- src/include/ipxe/efi/Protocol/HiiImage.h | 5 +-- src/include/ipxe/efi/Protocol/Http.h | 5 +-- src/include/ipxe/efi/Protocol/Ip4.h | 5 +-- src/include/ipxe/efi/Protocol/Ip4Config2.h | 5 +-- src/include/ipxe/efi/Protocol/Ip6.h | 5 +-- src/include/ipxe/efi/Protocol/Ip6Config.h | 5 +-- src/include/ipxe/efi/Protocol/LoadFile.h | 5 +-- src/include/ipxe/efi/Protocol/LoadFile2.h | 7 +--- src/include/ipxe/efi/Protocol/LoadedImage.h | 5 +-- .../ipxe/efi/Protocol/ManagedNetwork.h | 5 +-- src/include/ipxe/efi/Protocol/MpService.h | 5 +-- src/include/ipxe/efi/Protocol/Mtftp4.h | 5 +-- src/include/ipxe/efi/Protocol/Mtftp6.h | 5 +-- .../efi/Protocol/NetworkInterfaceIdentifier.h | 5 +-- src/include/ipxe/efi/Protocol/PciIo.h | 5 +-- .../ipxe/efi/Protocol/PciRootBridgeIo.h | 5 +-- src/include/ipxe/efi/Protocol/PxeBaseCode.h | 5 +-- src/include/ipxe/efi/Protocol/Rng.h | 5 +-- src/include/ipxe/efi/Protocol/SerialIo.h | 5 +-- .../ipxe/efi/Protocol/ServiceBinding.h | 5 +-- .../ipxe/efi/Protocol/SimpleFileSystem.h | 5 +-- src/include/ipxe/efi/Protocol/SimpleNetwork.h | 5 +-- src/include/ipxe/efi/Protocol/SimplePointer.h | 5 +-- src/include/ipxe/efi/Protocol/SimpleTextIn.h | 5 +-- .../ipxe/efi/Protocol/SimpleTextInEx.h | 5 +-- src/include/ipxe/efi/Protocol/SimpleTextOut.h | 5 +-- .../efi/Protocol/StorageSecurityCommand.h | 5 +-- src/include/ipxe/efi/Protocol/Supplicant.h | 5 +-- src/include/ipxe/efi/Protocol/Tcg2Protocol.h | 5 +-- src/include/ipxe/efi/Protocol/TcgService.h | 5 +-- src/include/ipxe/efi/Protocol/Tcp4.h | 5 +-- src/include/ipxe/efi/Protocol/Tcp6.h | 5 +-- src/include/ipxe/efi/Protocol/Udp4.h | 5 +-- src/include/ipxe/efi/Protocol/Udp6.h | 5 +-- .../ipxe/efi/Protocol/UnicodeCollation.h | 5 +-- .../ipxe/efi/Protocol/Usb2HostController.h | 5 +-- src/include/ipxe/efi/Protocol/UsbIo.h | 5 +-- src/include/ipxe/efi/Protocol/VlanConfig.h | 5 +-- src/include/ipxe/efi/Protocol/WiFi2.h | 5 +-- src/include/ipxe/efi/RiscV64/ProcessorBind.h | 5 +-- src/include/ipxe/efi/Uefi.h | 5 +-- src/include/ipxe/efi/Uefi/UefiBaseType.h | 40 ++++++++++--------- src/include/ipxe/efi/Uefi/UefiGpt.h | 4 +- .../efi/Uefi/UefiInternalFormRepresentation.h | 12 +++--- src/include/ipxe/efi/Uefi/UefiMultiPhase.h | 12 +++--- src/include/ipxe/efi/Uefi/UefiPxe.h | 5 +-- src/include/ipxe/efi/Uefi/UefiSpec.h | 5 +-- src/include/ipxe/efi/X64/ProcessorBind.h | 5 +-- src/include/ipxe/efi/import.pl | 8 +++- 119 files changed, 221 insertions(+), 495 deletions(-) diff --git a/src/include/ipxe/efi/AArch64/ProcessorBind.h b/src/include/ipxe/efi/AArch64/ProcessorBind.h index a64646ab4..b6db8ec3b 100644 --- a/src/include/ipxe/efi/AArch64/ProcessorBind.h +++ b/src/include/ipxe/efi/AArch64/ProcessorBind.h @@ -9,8 +9,7 @@ **/ -#ifndef __PROCESSOR_BIND_H__ -#define __PROCESSOR_BIND_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -182,9 +181,16 @@ typedef INT64 INTN; /// #define ASM_GLOBAL .globl +// PE targets (i.e. building with CLANGPDB) do not support the ELF style .type directive + #ifdef __ELF__ +#define _ASM_TYPE(Name) .type Name, %function + #else +#define _ASM_TYPE(Name) + #endif // __ELF__ + #define GCC_ASM_EXPORT(func__) \ - .global _CONCATENATE (__USER_LABEL_PREFIX__, func__) ;\ - .type ASM_PFX(func__), %function + .global ASM_PFX(func__) ;\ + _ASM_TYPE(ASM_PFX(func__)) #define GCC_ASM_IMPORT(func__) \ .extern _CONCATENATE (__USER_LABEL_PREFIX__, func__) @@ -240,5 +246,3 @@ typedef INT64 INTN; #ifndef __USER_LABEL_PREFIX__ #define __USER_LABEL_PREFIX__ #endif - -#endif diff --git a/src/include/ipxe/efi/Base.h b/src/include/ipxe/efi/Base.h index 0002309a3..769f3f031 100644 --- a/src/include/ipxe/efi/Base.h +++ b/src/include/ipxe/efi/Base.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __BASE_H__ -#define __BASE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -1394,5 +1393,3 @@ _ReturnAddress ( **/ #define ARRAY_SIZE(Array) (sizeof (Array) / sizeof ((Array)[0])) - -#endif diff --git a/src/include/ipxe/efi/Guid/Acpi.h b/src/include/ipxe/efi/Guid/Acpi.h index 70beebe34..c3a8fc1da 100644 --- a/src/include/ipxe/efi/Guid/Acpi.h +++ b/src/include/ipxe/efi/Guid/Acpi.h @@ -13,8 +13,7 @@ **/ -#ifndef __ACPI_GUID_H__ -#define __ACPI_GUID_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -39,5 +38,3 @@ FILE_SECBOOT ( PERMITTED ); extern EFI_GUID gEfiAcpiTableGuid; extern EFI_GUID gEfiAcpi10TableGuid; extern EFI_GUID gEfiAcpi20TableGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/Fdt.h b/src/include/ipxe/efi/Guid/Fdt.h index 5e303ab34..275626a42 100644 --- a/src/include/ipxe/efi/Guid/Fdt.h +++ b/src/include/ipxe/efi/Guid/Fdt.h @@ -6,8 +6,7 @@ * **/ -#ifndef __FDT_H__ -#define __FDT_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -16,5 +15,3 @@ FILE_SECBOOT ( PERMITTED ); { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } } extern EFI_GUID gFdtTableGuid; - -#endif /* __FDT_H__ */ diff --git a/src/include/ipxe/efi/Guid/FileInfo.h b/src/include/ipxe/efi/Guid/FileInfo.h index 7baa4550f..dd18fc08b 100644 --- a/src/include/ipxe/efi/Guid/FileInfo.h +++ b/src/include/ipxe/efi/Guid/FileInfo.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __FILE_INFO_H__ -#define __FILE_INFO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -65,5 +64,3 @@ typedef struct { #define SIZE_OF_EFI_FILE_INFO OFFSET_OF (EFI_FILE_INFO, FileName) extern EFI_GUID gEfiFileInfoGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/FileSystemInfo.h b/src/include/ipxe/efi/Guid/FileSystemInfo.h index 7f6b9cfdc..e5a84a103 100644 --- a/src/include/ipxe/efi/Guid/FileSystemInfo.h +++ b/src/include/ipxe/efi/Guid/FileSystemInfo.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __FILE_SYSTEM_INFO_H__ -#define __FILE_SYSTEM_INFO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -56,5 +55,3 @@ typedef struct { #define SIZE_OF_EFI_FILE_SYSTEM_INFO OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel) extern EFI_GUID gEfiFileSystemInfoGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/GlobalVariable.h b/src/include/ipxe/efi/Guid/GlobalVariable.h index 48fe5337e..080d8593f 100644 --- a/src/include/ipxe/efi/Guid/GlobalVariable.h +++ b/src/include/ipxe/efi/Guid/GlobalVariable.h @@ -8,8 +8,7 @@ GUID defined in UEFI 2.1 **/ -#ifndef __GLOBAL_VARIABLE_GUID_H__ -#define __GLOBAL_VARIABLE_GUID_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -191,5 +190,3 @@ extern EFI_GUID gEfiGlobalVariableGuid; /// The content is UINT8. /// #define EFI_DEVICE_AUTH_BOOT_MODE_NAME L"devAuthBoot" - -#endif diff --git a/src/include/ipxe/efi/Guid/HiiFormMapMethodGuid.h b/src/include/ipxe/efi/Guid/HiiFormMapMethodGuid.h index a3fb84732..87a94be17 100644 --- a/src/include/ipxe/efi/Guid/HiiFormMapMethodGuid.h +++ b/src/include/ipxe/efi/Guid/HiiFormMapMethodGuid.h @@ -8,8 +8,7 @@ GUID defined in UEFI 2.2 spec. **/ -#ifndef __EFI_HII_FORMMAP_GUID_H__ -#define __EFI_HII_FORMMAP_GUID_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -18,5 +17,3 @@ FILE_SECBOOT ( PERMITTED ); { 0x3bd2f4ec, 0xe524, 0x46e4, { 0xa9, 0xd8, 0x51, 0x1, 0x17, 0x42, 0x55, 0x62 } } extern EFI_GUID gEfiHiiStandardFormGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/HiiPlatformSetupFormset.h b/src/include/ipxe/efi/Guid/HiiPlatformSetupFormset.h index 647360242..0eb4a336d 100644 --- a/src/include/ipxe/efi/Guid/HiiPlatformSetupFormset.h +++ b/src/include/ipxe/efi/Guid/HiiPlatformSetupFormset.h @@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __HII_PLATFORM_SETUP_FORMSET_GUID_H__ -#define __HII_PLATFORM_SETUP_FORMSET_GUID_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -32,5 +31,3 @@ extern EFI_GUID gEfiHiiPlatformSetupFormsetGuid; extern EFI_GUID gEfiHiiDriverHealthFormsetGuid; extern EFI_GUID gEfiHiiUserCredentialFormsetGuid; extern EFI_GUID gEfiHiiRestStyleFormsetGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/ImageAuthentication.h b/src/include/ipxe/efi/Guid/ImageAuthentication.h index 6b82eb5d0..ac5349a2f 100644 --- a/src/include/ipxe/efi/Guid/ImageAuthentication.h +++ b/src/include/ipxe/efi/Guid/ImageAuthentication.h @@ -8,8 +8,7 @@ GUIDs defined in UEFI 2.5 spec. **/ -#ifndef __IMAGE_AUTHTICATION_H__ -#define __IMAGE_AUTHTICATION_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -384,5 +383,3 @@ extern EFI_GUID gEfiCertX509Sha512Guid; extern EFI_GUID gEfiCertPkcs7Guid; extern EFI_GUID gEfiCertSm3Guid; extern EFI_GUID gEfiCertX509Sm3Guid; - -#endif diff --git a/src/include/ipxe/efi/Guid/MdeModuleHii.h b/src/include/ipxe/efi/Guid/MdeModuleHii.h index 1634b8c62..df046af2c 100644 --- a/src/include/ipxe/efi/Guid/MdeModuleHii.h +++ b/src/include/ipxe/efi/Guid/MdeModuleHii.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __MDEMODULE_HII_H__ -#define __MDEMODULE_HII_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -230,5 +229,3 @@ typedef struct _EFI_IFR_GUID_VAREQNAME { extern EFI_GUID gEfiIfrTianoGuid; extern EFI_GUID gEfiIfrFrameworkGuid; extern EFI_GUID gEdkiiIfrBitVarstoreGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/MicrosoftVendor.h b/src/include/ipxe/efi/Guid/MicrosoftVendor.h index ded1b9019..56c1127fd 100644 --- a/src/include/ipxe/efi/Guid/MicrosoftVendor.h +++ b/src/include/ipxe/efi/Guid/MicrosoftVendor.h @@ -16,8 +16,7 @@ . **/ -#ifndef MICROSOFT_VENDOR_H_ -#define MICROSOFT_VENDOR_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -54,5 +53,3 @@ FILE_SECBOOT ( PERMITTED ); } extern EFI_GUID gMicrosoftVendorGuid; - -#endif /* MICROSOFT_VENDOR_H_ */ diff --git a/src/include/ipxe/efi/Guid/PcAnsi.h b/src/include/ipxe/efi/Guid/PcAnsi.h index 73b740afd..c8545fb8d 100644 --- a/src/include/ipxe/efi/Guid/PcAnsi.h +++ b/src/include/ipxe/efi/Guid/PcAnsi.h @@ -9,8 +9,7 @@ **/ -#ifndef __PC_ANSI_H__ -#define __PC_ANSI_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -51,5 +50,3 @@ extern EFI_GUID gEfiVT100PlusGuid; extern EFI_GUID gEfiVTUTF8Guid; extern EFI_GUID gEfiUartDevicePathGuid; extern EFI_GUID gEfiSasDevicePathGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/Rng.h b/src/include/ipxe/efi/Guid/Rng.h index 448b3a69b..68832d45d 100644 --- a/src/include/ipxe/efi/Guid/Rng.h +++ b/src/include/ipxe/efi/Guid/Rng.h @@ -7,8 +7,7 @@ **/ -#ifndef RNG_GUID_H_ -#define RNG_GUID_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -154,5 +153,3 @@ extern EFI_GUID gEfiRngAlgorithmX9313DesGuid; extern EFI_GUID gEfiRngAlgorithmX931AesGuid; extern EFI_GUID gEfiRngAlgorithmRaw; extern EFI_GUID gEfiRngAlgorithmArmRndr; - -#endif // #ifndef RNG_GUID_H_ diff --git a/src/include/ipxe/efi/Guid/SmBios.h b/src/include/ipxe/efi/Guid/SmBios.h index 45149bc6f..6fd54c2b7 100644 --- a/src/include/ipxe/efi/Guid/SmBios.h +++ b/src/include/ipxe/efi/Guid/SmBios.h @@ -13,8 +13,7 @@ **/ -#ifndef __SMBIOS_GUID_H__ -#define __SMBIOS_GUID_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -31,5 +30,3 @@ FILE_SECBOOT ( PERMITTED ); extern EFI_GUID gEfiSmbiosTableGuid; extern EFI_GUID gEfiSmbios3TableGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/TlsAuthentication.h b/src/include/ipxe/efi/Guid/TlsAuthentication.h index 806fba92c..254bfbb9e 100644 --- a/src/include/ipxe/efi/Guid/TlsAuthentication.h +++ b/src/include/ipxe/efi/Guid/TlsAuthentication.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __TLS_AUTHENTICATION_H__ -#define __TLS_AUTHENTICATION_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -22,5 +21,3 @@ FILE_SECBOOT ( PERMITTED ); #define EFI_TLS_CA_CERTIFICATE_VARIABLE L"TlsCaCertificate" extern EFI_GUID gEfiTlsCaCertificateGuid; - -#endif diff --git a/src/include/ipxe/efi/Guid/WinCertificate.h b/src/include/ipxe/efi/Guid/WinCertificate.h index efa6c3d9b..5c9a36a2f 100644 --- a/src/include/ipxe/efi/Guid/WinCertificate.h +++ b/src/include/ipxe/efi/Guid/WinCertificate.h @@ -8,8 +8,7 @@ GUID defined in UEFI 2.0 spec. **/ -#ifndef __EFI_WIN_CERTIFICATE_H__ -#define __EFI_WIN_CERTIFICATE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -119,5 +118,3 @@ typedef struct { } WIN_CERTIFICATE_EFI_PKCS1_15; extern EFI_GUID gEfiCertTypeRsa2048Sha256Guid; - -#endif diff --git a/src/include/ipxe/efi/Ia32/ProcessorBind.h b/src/include/ipxe/efi/Ia32/ProcessorBind.h index 4272ed254..64d09bcbf 100644 --- a/src/include/ipxe/efi/Ia32/ProcessorBind.h +++ b/src/include/ipxe/efi/Ia32/ProcessorBind.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PROCESSOR_BIND_H__ -#define __PROCESSOR_BIND_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -314,5 +313,3 @@ typedef INT32 INTN; #ifndef __USER_LABEL_PREFIX__ #define __USER_LABEL_PREFIX__ _ #endif - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi10.h b/src/include/ipxe/efi/IndustryStandard/Acpi10.h index 0dc281b55..c2b534476 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi10.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi10.h @@ -6,8 +6,7 @@ Copyright (c) 2020, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_1_0_H_ -#define _ACPI_1_0_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -665,5 +664,3 @@ typedef struct { #define EFI_ACPI_1_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE SIGNATURE_32('S', 'S', 'D', 'T') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi20.h b/src/include/ipxe/efi/IndustryStandard/Acpi20.h index 131d760da..b5f8504b0 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi20.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi20.h @@ -5,8 +5,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_2_0_H_ -#define _ACPI_2_0_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -538,5 +537,3 @@ typedef struct { #define EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE SIGNATURE_32('M', 'C', 'F', 'G') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi30.h b/src/include/ipxe/efi/IndustryStandard/Acpi30.h index d5c1a82b3..787cd5e2b 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi30.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi30.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_3_0_H_ -#define _ACPI_3_0_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -747,5 +746,3 @@ typedef struct { #define EFI_ACPI_3_0_ISCSI_BOOT_FIRMWARE_TABLE_SIGNATURE SIGNATURE_32('i', 'B', 'F', 'T') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi40.h b/src/include/ipxe/efi/IndustryStandard/Acpi40.h index f668ce04b..fac02f62b 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi40.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi40.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_4_0_H_ -#define _ACPI_4_0_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -1319,5 +1318,3 @@ typedef struct { #define EFI_ACPI_4_0_WATCHDOG_RESOURCE_TABLE_SIGNATURE SIGNATURE_32('W', 'D', 'R', 'T') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi50.h b/src/include/ipxe/efi/IndustryStandard/Acpi50.h index 1621411b1..3332560cb 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi50.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi50.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_5_0_H_ -#define _ACPI_5_0_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -908,8 +907,8 @@ typedef struct { /// /// ACPI RASF Platform RAS Capabilities /// -#define EFI_ACPI_5_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPOTED 0x01 -#define EFI_ACPI_5_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPOTED_AND_EXPOSED_TO_SOFTWARE 0x02 +#define EFI_ACPI_5_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPORTED BIT0 +#define EFI_ACPI_5_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPORTED_AND_EXPOSED_TO_SOFTWARE BIT1 /// /// ACPI RASF Parameter Block structure for PATROL_SCRUB @@ -2174,5 +2173,3 @@ typedef struct { #define EFI_ACPI_5_0_PLATFORM_BINARY_TABLE_SIGNATURE SIGNATURE_32('W', 'P', 'B', 'T') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi51.h b/src/include/ipxe/efi/IndustryStandard/Acpi51.h index ec48c5b25..772fdf69f 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi51.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi51.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_5_1_H_ -#define _ACPI_5_1_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -829,8 +828,8 @@ typedef struct { /// /// ACPI RASF Platform RAS Capabilities /// -#define EFI_ACPI_5_1_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPOTED 0x01 -#define EFI_ACPI_5_1_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPOTED_AND_EXPOSED_TO_SOFTWARE 0x02 +#define EFI_ACPI_5_1_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPORTED BIT0 +#define EFI_ACPI_5_1_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPORTED_AND_EXPOSED_TO_SOFTWARE BIT1 /// /// ACPI RASF Parameter Block structure for PATROL_SCRUB @@ -2185,5 +2184,3 @@ typedef struct { #define EFI_ACPI_5_1_PLATFORM_BINARY_TABLE_SIGNATURE SIGNATURE_32('W', 'P', 'B', 'T') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Acpi60.h b/src/include/ipxe/efi/IndustryStandard/Acpi60.h index 251e27e49..10e900427 100644 --- a/src/include/ipxe/efi/IndustryStandard/Acpi60.h +++ b/src/include/ipxe/efi/IndustryStandard/Acpi60.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_6_0_H_ -#define _ACPI_6_0_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -844,8 +843,8 @@ typedef struct { /// /// ACPI RASF Platform RAS Capabilities /// -#define EFI_ACPI_6_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPOTED 0x01 -#define EFI_ACPI_6_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPOTED_AND_EXPOSED_TO_SOFTWARE 0x02 +#define EFI_ACPI_6_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPORTED BIT0 +#define EFI_ACPI_6_0_RASF_PLATFORM_RAS_CAPABILITY_HARDWARE_BASED_PATROL_SCRUB_SUPPORTED_AND_EXPOSED_TO_SOFTWARE BIT1 /// /// ACPI RASF Parameter Block structure for PATROL_SCRUB @@ -2419,5 +2418,3 @@ typedef struct { #define EFI_ACPI_6_0_XEN_PROJECT_TABLE_SIGNATURE SIGNATURE_32('X', 'E', 'N', 'V') #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/AcpiAml.h b/src/include/ipxe/efi/IndustryStandard/AcpiAml.h index 4ea320cd0..f157cf593 100644 --- a/src/include/ipxe/efi/IndustryStandard/AcpiAml.h +++ b/src/include/ipxe/efi/IndustryStandard/AcpiAml.h @@ -3,12 +3,12 @@ Copyright (c) 2011, Intel Corporation. All rights reserved.
Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.
+ Copyright (C) 2026, Advanced Micro Devices, Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _ACPI_AML_H_ -#define _ACPI_AML_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -184,4 +184,7 @@ FILE_SECBOOT ( PERMITTED ); // #define AML_NAME_SEG_SIZE 4 -#endif +// +// AML Method maximum number of arguments definitions +// +#define AML_METHOD_MAX_NUM_ARGS 7 diff --git a/src/include/ipxe/efi/IndustryStandard/Bluetooth.h b/src/include/ipxe/efi/IndustryStandard/Bluetooth.h index b2547ca0b..ee3fc693c 100644 --- a/src/include/ipxe/efi/IndustryStandard/Bluetooth.h +++ b/src/include/ipxe/efi/IndustryStandard/Bluetooth.h @@ -7,8 +7,7 @@ **/ -#ifndef _BLUETOOTH_H_ -#define _BLUETOOTH_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -55,5 +54,3 @@ typedef struct { #define BLUETOOTH_HCI_COMMAND_LOCAL_READABLE_NAME_MAX_SIZE 248 #define BLUETOOTH_HCI_LINK_KEY_SIZE 16 - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Pci22.h b/src/include/ipxe/efi/IndustryStandard/Pci22.h index 477761c32..73830f98e 100644 --- a/src/include/ipxe/efi/IndustryStandard/Pci22.h +++ b/src/include/ipxe/efi/IndustryStandard/Pci22.h @@ -13,8 +13,7 @@ **/ -#ifndef _PCI22_H_ -#define _PCI22_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -877,5 +876,3 @@ typedef union { } EFI_PCI_ROM_HEADER; #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/PeImage.h b/src/include/ipxe/efi/IndustryStandard/PeImage.h index f99deb051..1d336377e 100644 --- a/src/include/ipxe/efi/IndustryStandard/PeImage.h +++ b/src/include/ipxe/efi/IndustryStandard/PeImage.h @@ -16,8 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PE_IMAGE_H__ -#define __PE_IMAGE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -814,5 +813,3 @@ typedef union { EFI_TE_IMAGE_HEADER *Te; EFI_IMAGE_OPTIONAL_HEADER_UNION *Union; } EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION; - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Tpm12.h b/src/include/ipxe/efi/IndustryStandard/Tpm12.h index 02fda8564..83fa647d5 100644 --- a/src/include/ipxe/efi/IndustryStandard/Tpm12.h +++ b/src/include/ipxe/efi/IndustryStandard/Tpm12.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _TPM12_H_ -#define _TPM12_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -2164,5 +2163,3 @@ typedef struct tdTPM_RSP_COMMAND_HDR { } TPM_RSP_COMMAND_HDR; #pragma pack () - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Tpm20.h b/src/include/ipxe/efi/IndustryStandard/Tpm20.h index c70e0a121..995a39d6e 100644 --- a/src/include/ipxe/efi/IndustryStandard/Tpm20.h +++ b/src/include/ipxe/efi/IndustryStandard/Tpm20.h @@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _TPM20_H_ -#define _TPM20_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -1812,5 +1811,3 @@ typedef struct { #define HASH_ALG_SHA384 0x00000004 #define HASH_ALG_SHA512 0x00000008 #define HASH_ALG_SM3_256 0x00000010 - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/UefiTcgPlatform.h b/src/include/ipxe/efi/IndustryStandard/UefiTcgPlatform.h index 98bf7b689..07fbc42ab 100644 --- a/src/include/ipxe/efi/IndustryStandard/UefiTcgPlatform.h +++ b/src/include/ipxe/efi/IndustryStandard/UefiTcgPlatform.h @@ -7,8 +7,7 @@ **/ -#ifndef __UEFI_TCG_PLATFORM_H__ -#define __UEFI_TCG_PLATFORM_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -720,5 +719,3 @@ typedef struct { } TCG_NV_INDEX_DYNAMIC_EVENT_LOG_STRUCT_SPDM_MEASUREMENTS; #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/IndustryStandard/Usb.h b/src/include/ipxe/efi/IndustryStandard/Usb.h index a2b6c1ab9..4378a9e7b 100644 --- a/src/include/ipxe/efi/IndustryStandard/Usb.h +++ b/src/include/ipxe/efi/IndustryStandard/Usb.h @@ -8,8 +8,7 @@ **/ -#ifndef __USB_H__ -#define __USB_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -396,5 +395,3 @@ typedef struct hid_descriptor { } EFI_USB_HID_DESCRIPTOR; #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/Library/BaseLib.h b/src/include/ipxe/efi/Library/BaseLib.h index 30e2c76b1..80a610e3b 100644 --- a/src/include/ipxe/efi/Library/BaseLib.h +++ b/src/include/ipxe/efi/Library/BaseLib.h @@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __BASE_LIB__ -#define __BASE_LIB__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -5495,6 +5494,42 @@ AsmRmpAdjust ( IN UINT64 Rdx ); +/** + Reads the current value of the FS segment base address. + + Reads and returns the current value of the FS segment base address using + the RDFSBASE instruction. This function is only available on X64. + + Note: The function requires that CPUID.(EAX=7,ECX=0):EBX.FSGSBASE=1 + and CR4.FSGSBASE=1. + + @return The current value of the FS segment base address. +**/ +UINT64 +EFIAPI +AsmReadFsBase ( + VOID + ); + +/** + Writes a value to the FS segment base address. + + Writes FsBase to the FS segment base address register using the WRFSBASE + instruction. This function is only available on X64. + + Note: The function requires that CPUID.(EAX=7,ECX=0):EBX.FSGSBASE=1 + and CR4.FSGSBASE=1. + + @param FsBase The value to write to the FS segment base address. + + @return FsBase +**/ +UINT64 +EFIAPI +AsmWriteFsBase ( + IN UINT64 FsBase + ); + #endif #if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) @@ -8148,4 +8183,3 @@ PatchInstructionX86 ( ); #endif // defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) -#endif // !defined (__BASE_LIB__) diff --git a/src/include/ipxe/efi/LoongArch64/ProcessorBind.h b/src/include/ipxe/efi/LoongArch64/ProcessorBind.h index ba7c52ce7..0a9e5e5e6 100644 --- a/src/include/ipxe/efi/LoongArch64/ProcessorBind.h +++ b/src/include/ipxe/efi/LoongArch64/ProcessorBind.h @@ -7,8 +7,7 @@ **/ -#ifndef PROCESSOR_BIND_H_ -#define PROCESSOR_BIND_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -119,5 +118,3 @@ typedef INT64 INTN; #ifndef __USER_LABEL_PREFIX__ #define __USER_LABEL_PREFIX__ #endif - -#endif diff --git a/src/include/ipxe/efi/Pi/PiBootMode.h b/src/include/ipxe/efi/Pi/PiBootMode.h index 9451c8cbe..86e0300a0 100644 --- a/src/include/ipxe/efi/Pi/PiBootMode.h +++ b/src/include/ipxe/efi/Pi/PiBootMode.h @@ -9,8 +9,7 @@ **/ -#ifndef __PI_BOOT_MODE_H__ -#define __PI_BOOT_MODE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -35,5 +34,3 @@ typedef UINT32 EFI_BOOT_MODE; #define BOOT_ON_S3_RESUME 0x11 #define BOOT_ON_FLASH_UPDATE 0x12 #define BOOT_IN_RECOVERY_MODE 0x20 - -#endif diff --git a/src/include/ipxe/efi/Pi/PiDependency.h b/src/include/ipxe/efi/Pi/PiDependency.h index 8c9ffc40b..a609e32f8 100644 --- a/src/include/ipxe/efi/Pi/PiDependency.h +++ b/src/include/ipxe/efi/Pi/PiDependency.h @@ -9,8 +9,7 @@ **/ -#ifndef __PI_DEPENDENCY_H__ -#define __PI_DEPENDENCY_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -40,5 +39,3 @@ FILE_SECBOOT ( PERMITTED ); /// EFI_DEP_SOR is only used by DXE driver. /// #define EFI_DEP_SOR 0x09 - -#endif diff --git a/src/include/ipxe/efi/Pi/PiDxeCis.h b/src/include/ipxe/efi/Pi/PiDxeCis.h index b501b053f..b91c09f07 100644 --- a/src/include/ipxe/efi/Pi/PiDxeCis.h +++ b/src/include/ipxe/efi/Pi/PiDxeCis.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_DXECIS_H__ -#define __PI_DXECIS_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -739,5 +738,3 @@ typedef struct { } DXE_SERVICES; typedef DXE_SERVICES EFI_DXE_SERVICES; - -#endif diff --git a/src/include/ipxe/efi/Pi/PiFirmwareFile.h b/src/include/ipxe/efi/Pi/PiFirmwareFile.h index f81070bb0..035ddc716 100644 --- a/src/include/ipxe/efi/Pi/PiFirmwareFile.h +++ b/src/include/ipxe/efi/Pi/PiFirmwareFile.h @@ -9,13 +9,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_FIRMWARE_FILE_H__ -#define __PI_FIRMWARE_FILE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); -#pragma pack(1) +#ifndef __PI_FIRMWARE_FILE_H__ +#define __PI_FIRMWARE_FILE_H__ + + #pragma pack(1) /// /// Used to verify the integrity of the file. /// @@ -504,6 +506,6 @@ typedef struct { #define SECTION2_SIZE(SectionHeaderPtr) \ (((EFI_COMMON_SECTION_HEADER2 *) (UINTN) SectionHeaderPtr)->ExtendedSize) -#pragma pack() + #pragma pack() #endif diff --git a/src/include/ipxe/efi/Pi/PiFirmwareVolume.h b/src/include/ipxe/efi/Pi/PiFirmwareVolume.h index c67f70dcb..633f05e4d 100644 --- a/src/include/ipxe/efi/Pi/PiFirmwareVolume.h +++ b/src/include/ipxe/efi/Pi/PiFirmwareVolume.h @@ -9,12 +9,14 @@ **/ -#ifndef __PI_FIRMWAREVOLUME_H__ -#define __PI_FIRMWAREVOLUME_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); +#ifndef __PI_FIRMWAREVOLUME_H__ +#define __PI_FIRMWAREVOLUME_H__ + /// /// EFI_FV_FILE_ATTRIBUTES /// diff --git a/src/include/ipxe/efi/Pi/PiHob.h b/src/include/ipxe/efi/Pi/PiHob.h index 4a98e2645..e154a7c98 100644 --- a/src/include/ipxe/efi/Pi/PiHob.h +++ b/src/include/ipxe/efi/Pi/PiHob.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_HOB_H__ -#define __PI_HOB_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -511,5 +510,3 @@ typedef union { EFI_HOB_UEFI_CAPSULE *Capsule; UINT8 *Raw; } EFI_PEI_HOB_POINTERS; - -#endif diff --git a/src/include/ipxe/efi/Pi/PiMultiPhase.h b/src/include/ipxe/efi/Pi/PiMultiPhase.h index f5ee07068..95b41d1bb 100644 --- a/src/include/ipxe/efi/Pi/PiMultiPhase.h +++ b/src/include/ipxe/efi/Pi/PiMultiPhase.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_MULTIPHASE_H__ -#define __PI_MULTIPHASE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -268,5 +267,3 @@ EFI_STATUS ); extern EFI_GUID gEfiMmCommunicateHeaderV3Guid; - -#endif diff --git a/src/include/ipxe/efi/Pi/PiS3BootScript.h b/src/include/ipxe/efi/Pi/PiS3BootScript.h index e7086a565..0687d3bb7 100644 --- a/src/include/ipxe/efi/Pi/PiS3BootScript.h +++ b/src/include/ipxe/efi/Pi/PiS3BootScript.h @@ -7,8 +7,7 @@ **/ -#ifndef _PI_S3_BOOT_SCRIPT_H_ -#define _PI_S3_BOOT_SCRIPT_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -52,5 +51,3 @@ typedef enum { EfiBootScriptWidthFillUint64, EfiBootScriptWidthMaximum } EFI_BOOT_SCRIPT_WIDTH; - -#endif diff --git a/src/include/ipxe/efi/Pi/PiStatusCode.h b/src/include/ipxe/efi/Pi/PiStatusCode.h index 6015cabb2..42278592f 100644 --- a/src/include/ipxe/efi/Pi/PiStatusCode.h +++ b/src/include/ipxe/efi/Pi/PiStatusCode.h @@ -11,8 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_STATUS_CODE_H__ -#define __PI_STATUS_CODE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -1219,5 +1218,3 @@ typedef struct { #define EFI_SW_EC_ARM_IRQ EXCEPT_ARM_IRQ #define EFI_SW_EC_ARM_FIQ EXCEPT_ARM_FIQ ///@} - -#endif diff --git a/src/include/ipxe/efi/PiDxe.h b/src/include/ipxe/efi/PiDxe.h index cef2a0273..86afd6a2b 100644 --- a/src/include/ipxe/efi/PiDxe.h +++ b/src/include/ipxe/efi/PiDxe.h @@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_DXE_H__ -#define __PI_DXE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -17,5 +16,3 @@ FILE_SECBOOT ( PERMITTED ); #include #include - -#endif diff --git a/src/include/ipxe/efi/Protocol/AbsolutePointer.h b/src/include/ipxe/efi/Protocol/AbsolutePointer.h index 886d214a9..06cbf067e 100644 --- a/src/include/ipxe/efi/Protocol/AbsolutePointer.h +++ b/src/include/ipxe/efi/Protocol/AbsolutePointer.h @@ -10,8 +10,7 @@ **/ -#ifndef __ABSOLUTE_POINTER_H__ -#define __ABSOLUTE_POINTER_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -191,5 +190,3 @@ struct _EFI_ABSOLUTE_POINTER_PROTOCOL { }; extern EFI_GUID gEfiAbsolutePointerProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/AcpiTable.h b/src/include/ipxe/efi/Protocol/AcpiTable.h index 601e7b769..e68e2f8c6 100644 --- a/src/include/ipxe/efi/Protocol/AcpiTable.h +++ b/src/include/ipxe/efi/Protocol/AcpiTable.h @@ -10,8 +10,7 @@ **/ -#ifndef __ACPI_TABLE_H___ -#define __ACPI_TABLE_H___ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -120,5 +119,3 @@ struct _EFI_ACPI_TABLE_PROTOCOL { }; extern EFI_GUID gEfiAcpiTableProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/AdapterInformation.h b/src/include/ipxe/efi/Protocol/AdapterInformation.h index b52288793..468fb30af 100644 --- a/src/include/ipxe/efi/Protocol/AdapterInformation.h +++ b/src/include/ipxe/efi/Protocol/AdapterInformation.h @@ -11,8 +11,7 @@ **/ -#ifndef __EFI_ADAPTER_INFORMATION_PROTOCOL_H__ -#define __EFI_ADAPTER_INFORMATION_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -254,5 +253,3 @@ extern EFI_GUID gEfiAdapterInfoNetworkBootGuid; extern EFI_GUID gEfiAdapterInfoSanMacAddressGuid; extern EFI_GUID gEfiAdapterInfoUndiIpv6SupportGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Arp.h b/src/include/ipxe/efi/Protocol/Arp.h index 26dc89d59..c8d23773a 100644 --- a/src/include/ipxe/efi/Protocol/Arp.h +++ b/src/include/ipxe/efi/Protocol/Arp.h @@ -15,8 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_ARP_PROTOCOL_H__ -#define __EFI_ARP_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -375,5 +374,3 @@ struct _EFI_ARP_PROTOCOL { extern EFI_GUID gEfiArpServiceBindingProtocolGuid; extern EFI_GUID gEfiArpProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/BlockIo.h b/src/include/ipxe/efi/Protocol/BlockIo.h index c5614b1ef..9531e103f 100644 --- a/src/include/ipxe/efi/Protocol/BlockIo.h +++ b/src/include/ipxe/efi/Protocol/BlockIo.h @@ -9,8 +9,7 @@ **/ -#ifndef __BLOCK_IO_H__ -#define __BLOCK_IO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -233,5 +232,3 @@ struct _EFI_BLOCK_IO_PROTOCOL { }; extern EFI_GUID gEfiBlockIoProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/BlockIo2.h b/src/include/ipxe/efi/Protocol/BlockIo2.h index b985b5dab..5adc2d816 100644 --- a/src/include/ipxe/efi/Protocol/BlockIo2.h +++ b/src/include/ipxe/efi/Protocol/BlockIo2.h @@ -10,8 +10,7 @@ **/ -#ifndef __BLOCK_IO2_H__ -#define __BLOCK_IO2_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -196,5 +195,3 @@ struct _EFI_BLOCK_IO2_PROTOCOL { }; extern EFI_GUID gEfiBlockIo2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/BusSpecificDriverOverride.h b/src/include/ipxe/efi/Protocol/BusSpecificDriverOverride.h index a304f3bfa..22ea44c67 100644 --- a/src/include/ipxe/efi/Protocol/BusSpecificDriverOverride.h +++ b/src/include/ipxe/efi/Protocol/BusSpecificDriverOverride.h @@ -11,8 +11,7 @@ **/ -#ifndef _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL_H_ -#define _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -65,5 +64,3 @@ struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL { }; extern EFI_GUID gEfiBusSpecificDriverOverrideProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/ComponentName.h b/src/include/ipxe/efi/Protocol/ComponentName.h index 89e2e19d2..e774ef2a1 100644 --- a/src/include/ipxe/efi/Protocol/ComponentName.h +++ b/src/include/ipxe/efi/Protocol/ComponentName.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_COMPONENT_NAME_H__ -#define __EFI_COMPONENT_NAME_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -120,5 +119,3 @@ struct _EFI_COMPONENT_NAME_PROTOCOL { }; extern EFI_GUID gEfiComponentNameProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/ComponentName2.h b/src/include/ipxe/efi/Protocol/ComponentName2.h index ad7818a46..c79cc1bdd 100644 --- a/src/include/ipxe/efi/Protocol/ComponentName2.h +++ b/src/include/ipxe/efi/Protocol/ComponentName2.h @@ -8,8 +8,7 @@ **/ -#ifndef __EFI_COMPONENT_NAME2_H__ -#define __EFI_COMPONENT_NAME2_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -163,5 +162,3 @@ struct _EFI_COMPONENT_NAME2_PROTOCOL { }; extern EFI_GUID gEfiComponentName2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/DebugSupport.h b/src/include/ipxe/efi/Protocol/DebugSupport.h index e97b4c7f1..0541c3f39 100644 --- a/src/include/ipxe/efi/Protocol/DebugSupport.h +++ b/src/include/ipxe/efi/Protocol/DebugSupport.h @@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __DEBUG_SUPPORT_H__ -#define __DEBUG_SUPPORT_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -964,5 +963,3 @@ struct _EFI_DEBUG_SUPPORT_PROTOCOL { }; extern EFI_GUID gEfiDebugSupportProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/DevicePath.h b/src/include/ipxe/efi/Protocol/DevicePath.h index fd7a0ea27..1d723d139 100644 --- a/src/include/ipxe/efi/Protocol/DevicePath.h +++ b/src/include/ipxe/efi/Protocol/DevicePath.h @@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_DEVICE_PATH_PROTOCOL_H__ -#define __EFI_DEVICE_PATH_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -1396,5 +1395,3 @@ typedef union { #define END_INSTANCE_DEVICE_PATH_SUBTYPE 0x01 extern EFI_GUID gEfiDevicePathProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/DevicePathToText.h b/src/include/ipxe/efi/Protocol/DevicePathToText.h index fc68a7686..b088cd0f9 100644 --- a/src/include/ipxe/efi/Protocol/DevicePathToText.h +++ b/src/include/ipxe/efi/Protocol/DevicePathToText.h @@ -7,8 +7,7 @@ **/ -#ifndef __DEVICE_PATH_TO_TEXT_PROTOCOL_H__ -#define __DEVICE_PATH_TO_TEXT_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -76,5 +75,3 @@ typedef struct { } EFI_DEVICE_PATH_TO_TEXT_PROTOCOL; extern EFI_GUID gEfiDevicePathToTextProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Dhcp4.h b/src/include/ipxe/efi/Protocol/Dhcp4.h index c0a365c17..c32d0ae69 100644 --- a/src/include/ipxe/efi/Protocol/Dhcp4.h +++ b/src/include/ipxe/efi/Protocol/Dhcp4.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_DHCP4_PROTOCOL_H__ -#define __EFI_DHCP4_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -761,5 +760,3 @@ struct _EFI_DHCP4_PROTOCOL { extern EFI_GUID gEfiDhcp4ProtocolGuid; extern EFI_GUID gEfiDhcp4ServiceBindingProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Dhcp6.h b/src/include/ipxe/efi/Protocol/Dhcp6.h index 5a3e6148e..e295af3fa 100644 --- a/src/include/ipxe/efi/Protocol/Dhcp6.h +++ b/src/include/ipxe/efi/Protocol/Dhcp6.h @@ -10,8 +10,7 @@ **/ -#ifndef __EFI_DHCP6_PROTOCOL_H__ -#define __EFI_DHCP6_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -779,5 +778,3 @@ struct _EFI_DHCP6_PROTOCOL { extern EFI_GUID gEfiDhcp6ProtocolGuid; extern EFI_GUID gEfiDhcp6ServiceBindingProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/DiskIo.h b/src/include/ipxe/efi/Protocol/DiskIo.h index 7a81ad5ad..4a748e1ed 100644 --- a/src/include/ipxe/efi/Protocol/DiskIo.h +++ b/src/include/ipxe/efi/Protocol/DiskIo.h @@ -10,8 +10,7 @@ **/ -#ifndef __DISK_IO_H__ -#define __DISK_IO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -110,5 +109,3 @@ struct _EFI_DISK_IO_PROTOCOL { }; extern EFI_GUID gEfiDiskIoProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Dns4.h b/src/include/ipxe/efi/Protocol/Dns4.h index 36e9757a3..55af8a24f 100644 --- a/src/include/ipxe/efi/Protocol/Dns4.h +++ b/src/include/ipxe/efi/Protocol/Dns4.h @@ -12,8 +12,7 @@ **/ -#ifndef __EFI_DNS4_PROTOCOL_H__ -#define __EFI_DNS4_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -535,5 +534,3 @@ struct _EFI_DNS4_PROTOCOL { extern EFI_GUID gEfiDns4ServiceBindingProtocolGuid; extern EFI_GUID gEfiDns4ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Dns6.h b/src/include/ipxe/efi/Protocol/Dns6.h index 524988c5f..82c73a2f3 100644 --- a/src/include/ipxe/efi/Protocol/Dns6.h +++ b/src/include/ipxe/efi/Protocol/Dns6.h @@ -12,8 +12,7 @@ **/ -#ifndef __EFI_DNS6_PROTOCOL_H__ -#define __EFI_DNS6_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -532,5 +531,3 @@ struct _EFI_DNS6_PROTOCOL { extern EFI_GUID gEfiDns6ServiceBindingProtocolGuid; extern EFI_GUID gEfiDns6ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/DriverBinding.h b/src/include/ipxe/efi/Protocol/DriverBinding.h index 903545b98..1914eb01c 100644 --- a/src/include/ipxe/efi/Protocol/DriverBinding.h +++ b/src/include/ipxe/efi/Protocol/DriverBinding.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_DRIVER_BINDING_H__ -#define __EFI_DRIVER_BINDING_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -194,5 +193,3 @@ struct _EFI_DRIVER_BINDING_PROTOCOL { }; extern EFI_GUID gEfiDriverBindingProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/EapConfiguration.h b/src/include/ipxe/efi/Protocol/EapConfiguration.h index 980873945..35eac0f47 100644 --- a/src/include/ipxe/efi/Protocol/EapConfiguration.h +++ b/src/include/ipxe/efi/Protocol/EapConfiguration.h @@ -9,8 +9,7 @@ **/ -#ifndef __EFI_EAP_CONFIGURATION_PROTOCOL_H__ -#define __EFI_EAP_CONFIGURATION_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -152,5 +151,3 @@ struct _EFI_EAP_CONFIGURATION_PROTOCOL { }; extern EFI_GUID gEfiEapConfigurationProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/FormBrowser2.h b/src/include/ipxe/efi/Protocol/FormBrowser2.h index 7f726757b..26406784b 100644 --- a/src/include/ipxe/efi/Protocol/FormBrowser2.h +++ b/src/include/ipxe/efi/Protocol/FormBrowser2.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_FORM_BROWSER2_H__ -#define __EFI_FORM_BROWSER2_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -171,5 +170,3 @@ struct _EFI_FORM_BROWSER2_PROTOCOL { }; extern EFI_GUID gEfiFormBrowser2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/GraphicsOutput.h b/src/include/ipxe/efi/Protocol/GraphicsOutput.h index 1e822c208..b7c9260c0 100644 --- a/src/include/ipxe/efi/Protocol/GraphicsOutput.h +++ b/src/include/ipxe/efi/Protocol/GraphicsOutput.h @@ -8,8 +8,7 @@ **/ -#ifndef __GRAPHICS_OUTPUT_H__ -#define __GRAPHICS_OUTPUT_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -269,5 +268,3 @@ struct _EFI_GRAPHICS_OUTPUT_PROTOCOL { }; extern EFI_GUID gEfiGraphicsOutputProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Hash.h b/src/include/ipxe/efi/Protocol/Hash.h index aabbc3026..46b67d49e 100644 --- a/src/include/ipxe/efi/Protocol/Hash.h +++ b/src/include/ipxe/efi/Protocol/Hash.h @@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_HASH_PROTOCOL_H__ -#define __EFI_HASH_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -168,5 +167,3 @@ extern EFI_GUID gEfiHashAlgorithmSha512Guid; extern EFI_GUID gEfiHashAlgorithmMD5Guid; extern EFI_GUID gEfiHashAlgorithmSha1NoPadGuid; extern EFI_GUID gEfiHashAlgorithmSha256NoPadGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/HiiConfigAccess.h b/src/include/ipxe/efi/Protocol/HiiConfigAccess.h index e48a48335..3ab89f76a 100644 --- a/src/include/ipxe/efi/Protocol/HiiConfigAccess.h +++ b/src/include/ipxe/efi/Protocol/HiiConfigAccess.h @@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_HII_CONFIG_ACCESS_H__ -#define __EFI_HII_CONFIG_ACCESS_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -222,5 +221,3 @@ struct _EFI_HII_CONFIG_ACCESS_PROTOCOL { }; extern EFI_GUID gEfiHiiConfigAccessProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/HiiDatabase.h b/src/include/ipxe/efi/Protocol/HiiDatabase.h index 4338319d1..7aa9fcbc7 100644 --- a/src/include/ipxe/efi/Protocol/HiiDatabase.h +++ b/src/include/ipxe/efi/Protocol/HiiDatabase.h @@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __HII_DATABASE_H__ -#define __HII_DATABASE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -517,5 +516,3 @@ struct _EFI_HII_DATABASE_PROTOCOL { }; extern EFI_GUID gEfiHiiDatabaseProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/HiiFont.h b/src/include/ipxe/efi/Protocol/HiiFont.h index 6d6f88514..4fa53f30a 100644 --- a/src/include/ipxe/efi/Protocol/HiiFont.h +++ b/src/include/ipxe/efi/Protocol/HiiFont.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __HII_FONT_H__ -#define __HII_FONT_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -463,5 +462,3 @@ struct _EFI_HII_FONT_PROTOCOL { }; extern EFI_GUID gEfiHiiFontProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/HiiImage.h b/src/include/ipxe/efi/Protocol/HiiImage.h index f40c00eb7..7aa86e701 100644 --- a/src/include/ipxe/efi/Protocol/HiiImage.h +++ b/src/include/ipxe/efi/Protocol/HiiImage.h @@ -9,8 +9,7 @@ **/ -#ifndef __HII_IMAGE_H__ -#define __HII_IMAGE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -345,5 +344,3 @@ struct _EFI_HII_IMAGE_PROTOCOL { }; extern EFI_GUID gEfiHiiImageProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Http.h b/src/include/ipxe/efi/Protocol/Http.h index 84eb20600..9533e5e53 100644 --- a/src/include/ipxe/efi/Protocol/Http.h +++ b/src/include/ipxe/efi/Protocol/Http.h @@ -13,8 +13,7 @@ **/ -#ifndef __EFI_HTTP_PROTOCOL_H__ -#define __EFI_HTTP_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -529,5 +528,3 @@ struct _EFI_HTTP_PROTOCOL { extern EFI_GUID gEfiHttpServiceBindingProtocolGuid; extern EFI_GUID gEfiHttpProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Ip4.h b/src/include/ipxe/efi/Protocol/Ip4.h index f45465860..4b360d62d 100644 --- a/src/include/ipxe/efi/Protocol/Ip4.h +++ b/src/include/ipxe/efi/Protocol/Ip4.h @@ -18,8 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_IP4_PROTOCOL_H__ -#define __EFI_IP4_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -601,5 +600,3 @@ struct _EFI_IP4_PROTOCOL { extern EFI_GUID gEfiIp4ServiceBindingProtocolGuid; extern EFI_GUID gEfiIp4ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Ip4Config2.h b/src/include/ipxe/efi/Protocol/Ip4Config2.h index 362387179..aa8e5ea70 100644 --- a/src/include/ipxe/efi/Protocol/Ip4Config2.h +++ b/src/include/ipxe/efi/Protocol/Ip4Config2.h @@ -10,8 +10,7 @@ This Protocol is introduced in UEFI Specification 2.5 **/ -#ifndef __EFI_IP4CONFIG2_PROTOCOL_H__ -#define __EFI_IP4CONFIG2_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -315,5 +314,3 @@ struct _EFI_IP4_CONFIG2_PROTOCOL { }; extern EFI_GUID gEfiIp4Config2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Ip6.h b/src/include/ipxe/efi/Protocol/Ip6.h index 2d19b806a..8383b51b6 100644 --- a/src/include/ipxe/efi/Protocol/Ip6.h +++ b/src/include/ipxe/efi/Protocol/Ip6.h @@ -18,8 +18,7 @@ **/ -#ifndef __EFI_IP6_PROTOCOL_H__ -#define __EFI_IP6_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -945,5 +944,3 @@ struct _EFI_IP6_PROTOCOL { extern EFI_GUID gEfiIp6ServiceBindingProtocolGuid; extern EFI_GUID gEfiIp6ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Ip6Config.h b/src/include/ipxe/efi/Protocol/Ip6Config.h index 75c5adbb0..e1410f28d 100644 --- a/src/include/ipxe/efi/Protocol/Ip6Config.h +++ b/src/include/ipxe/efi/Protocol/Ip6Config.h @@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_IP6CONFIG_PROTOCOL_H__ -#define __EFI_IP6CONFIG_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -366,5 +365,3 @@ struct _EFI_IP6_CONFIG_PROTOCOL { }; extern EFI_GUID gEfiIp6ConfigProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/LoadFile.h b/src/include/ipxe/efi/Protocol/LoadFile.h index 47e164600..327734830 100644 --- a/src/include/ipxe/efi/Protocol/LoadFile.h +++ b/src/include/ipxe/efi/Protocol/LoadFile.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_LOAD_FILE_PROTOCOL_H__ -#define __EFI_LOAD_FILE_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -81,5 +80,3 @@ struct _EFI_LOAD_FILE_PROTOCOL { }; extern EFI_GUID gEfiLoadFileProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/LoadFile2.h b/src/include/ipxe/efi/Protocol/LoadFile2.h index 409e411cf..3a8769d35 100644 --- a/src/include/ipxe/efi/Protocol/LoadFile2.h +++ b/src/include/ipxe/efi/Protocol/LoadFile2.h @@ -12,8 +12,7 @@ **/ -#ifndef __EFI_LOAD_FILE2_PROTOCOL_H__ -#define __EFI_LOAD_FILE2_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -41,7 +40,7 @@ typedef struct _EFI_LOAD_FILE2_PROTOCOL EFI_LOAD_FILE2_PROTOCOL; Buffer. On output with a return code of EFI_BUFFER_TOO_SMALL, the size of Buffer required to retrieve the requested file. @param Buffer The memory buffer to transfer the file to. IF Buffer is NULL, - then no the size of the requested file is returned in + then the size of the requested file is returned in BufferSize. @retval EFI_SUCCESS The file was loaded. @@ -77,5 +76,3 @@ struct _EFI_LOAD_FILE2_PROTOCOL { }; extern EFI_GUID gEfiLoadFile2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/LoadedImage.h b/src/include/ipxe/efi/Protocol/LoadedImage.h index 401f464fa..87deb722a 100755 --- a/src/include/ipxe/efi/Protocol/LoadedImage.h +++ b/src/include/ipxe/efi/Protocol/LoadedImage.h @@ -9,8 +9,7 @@ **/ -#ifndef __LOADED_IMAGE_PROTOCOL_H__ -#define __LOADED_IMAGE_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -81,5 +80,3 @@ typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE; extern EFI_GUID gEfiLoadedImageProtocolGuid; extern EFI_GUID gEfiLoadedImageDevicePathProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/ManagedNetwork.h b/src/include/ipxe/efi/Protocol/ManagedNetwork.h index 60e7e9ae8..171c593b6 100644 --- a/src/include/ipxe/efi/Protocol/ManagedNetwork.h +++ b/src/include/ipxe/efi/Protocol/ManagedNetwork.h @@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_MANAGED_NETWORK_PROTOCOL_H__ -#define __EFI_MANAGED_NETWORK_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -363,5 +362,3 @@ struct _EFI_MANAGED_NETWORK_PROTOCOL { extern EFI_GUID gEfiManagedNetworkServiceBindingProtocolGuid; extern EFI_GUID gEfiManagedNetworkProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/MpService.h b/src/include/ipxe/efi/Protocol/MpService.h index 1a1874662..c1c1742f8 100644 --- a/src/include/ipxe/efi/Protocol/MpService.h +++ b/src/include/ipxe/efi/Protocol/MpService.h @@ -36,8 +36,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _MP_SERVICE_PROTOCOL_H_ -#define _MP_SERVICE_PROTOCOL_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -673,5 +672,3 @@ struct _EFI_MP_SERVICES_PROTOCOL { }; extern EFI_GUID gEfiMpServiceProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Mtftp4.h b/src/include/ipxe/efi/Protocol/Mtftp4.h index 5e50fcc9f..8c79b6207 100644 --- a/src/include/ipxe/efi/Protocol/Mtftp4.h +++ b/src/include/ipxe/efi/Protocol/Mtftp4.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_MTFTP4_PROTOCOL_H__ -#define __EFI_MTFTP4_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -575,5 +574,3 @@ struct _EFI_MTFTP4_TOKEN { extern EFI_GUID gEfiMtftp4ServiceBindingProtocolGuid; extern EFI_GUID gEfiMtftp4ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Mtftp6.h b/src/include/ipxe/efi/Protocol/Mtftp6.h index 5a6d640e5..9ce65c51f 100644 --- a/src/include/ipxe/efi/Protocol/Mtftp6.h +++ b/src/include/ipxe/efi/Protocol/Mtftp6.h @@ -13,8 +13,7 @@ **/ -#ifndef __EFI_MTFTP6_PROTOCOL_H__ -#define __EFI_MTFTP6_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -817,5 +816,3 @@ struct _EFI_MTFTP6_PROTOCOL { extern EFI_GUID gEfiMtftp6ServiceBindingProtocolGuid; extern EFI_GUID gEfiMtftp6ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h b/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h index 5a0a82071..71a64b443 100644 --- a/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h +++ b/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h @@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_NETWORK_INTERFACE_IDENTIFER_H__ -#define __EFI_NETWORK_INTERFACE_IDENTIFER_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -109,5 +108,3 @@ struct undiconfig_table { extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid; extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid_31; - -#endif diff --git a/src/include/ipxe/efi/Protocol/PciIo.h b/src/include/ipxe/efi/Protocol/PciIo.h index 3c2582cab..1a9c19d24 100644 --- a/src/include/ipxe/efi/Protocol/PciIo.h +++ b/src/include/ipxe/efi/Protocol/PciIo.h @@ -7,8 +7,7 @@ **/ -#ifndef __PCI_IO_H__ -#define __PCI_IO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -550,5 +549,3 @@ struct _EFI_PCI_IO_PROTOCOL { }; extern EFI_GUID gEfiPciIoProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h b/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h index 674e864d1..bcb5f37c3 100644 --- a/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h +++ b/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h @@ -10,8 +10,7 @@ **/ -#ifndef __PCI_ROOT_BRIDGE_IO_H__ -#define __PCI_ROOT_BRIDGE_IO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -435,5 +434,3 @@ struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL { }; extern EFI_GUID gEfiPciRootBridgeIoProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/PxeBaseCode.h b/src/include/ipxe/efi/Protocol/PxeBaseCode.h index 5db934370..f0b94a268 100644 --- a/src/include/ipxe/efi/Protocol/PxeBaseCode.h +++ b/src/include/ipxe/efi/Protocol/PxeBaseCode.h @@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PXE_BASE_CODE_PROTOCOL_H__ -#define __PXE_BASE_CODE_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -930,5 +929,3 @@ struct _EFI_PXE_BASE_CODE_PROTOCOL { }; extern EFI_GUID gEfiPxeBaseCodeProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Rng.h b/src/include/ipxe/efi/Protocol/Rng.h index e4ad3d716..18afe5006 100644 --- a/src/include/ipxe/efi/Protocol/Rng.h +++ b/src/include/ipxe/efi/Protocol/Rng.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef EFI_RNG_PROTOCOL_H_ -#define EFI_RNG_PROTOCOL_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -27,5 +26,3 @@ FILE_SECBOOT ( PERMITTED ); typedef EFI_RNG_INTERFACE EFI_RNG_PROTOCOL; extern EFI_GUID gEfiRngProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SerialIo.h b/src/include/ipxe/efi/Protocol/SerialIo.h index 31fd99215..6278cad0a 100644 --- a/src/include/ipxe/efi/Protocol/SerialIo.h +++ b/src/include/ipxe/efi/Protocol/SerialIo.h @@ -9,8 +9,7 @@ **/ -#ifndef __SERIAL_IO_PROTOCOL_H__ -#define __SERIAL_IO_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -308,5 +307,3 @@ struct _EFI_SERIAL_IO_PROTOCOL { extern EFI_GUID gEfiSerialIoProtocolGuid; extern EFI_GUID gEfiSerialTerminalDeviceTypeGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/ServiceBinding.h b/src/include/ipxe/efi/Protocol/ServiceBinding.h index d23059ccf..7d0f1910b 100644 --- a/src/include/ipxe/efi/Protocol/ServiceBinding.h +++ b/src/include/ipxe/efi/Protocol/ServiceBinding.h @@ -10,8 +10,7 @@ **/ -#ifndef __EFI_SERVICE_BINDING_H__ -#define __EFI_SERVICE_BINDING_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -87,5 +86,3 @@ struct _EFI_SERVICE_BINDING_PROTOCOL { EFI_SERVICE_BINDING_CREATE_CHILD CreateChild; EFI_SERVICE_BINDING_DESTROY_CHILD DestroyChild; }; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SimpleFileSystem.h b/src/include/ipxe/efi/Protocol/SimpleFileSystem.h index 39944c31a..86ffd5367 100644 --- a/src/include/ipxe/efi/Protocol/SimpleFileSystem.h +++ b/src/include/ipxe/efi/Protocol/SimpleFileSystem.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __SIMPLE_FILE_SYSTEM_H__ -#define __SIMPLE_FILE_SYSTEM_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -552,5 +551,3 @@ struct _EFI_FILE_PROTOCOL { }; extern EFI_GUID gEfiSimpleFileSystemProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SimpleNetwork.h b/src/include/ipxe/efi/Protocol/SimpleNetwork.h index d7e4e1182..84dfae91b 100644 --- a/src/include/ipxe/efi/Protocol/SimpleNetwork.h +++ b/src/include/ipxe/efi/Protocol/SimpleNetwork.h @@ -17,8 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __SIMPLE_NETWORK_H__ -#define __SIMPLE_NETWORK_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -674,5 +673,3 @@ struct _EFI_SIMPLE_NETWORK_PROTOCOL { }; extern EFI_GUID gEfiSimpleNetworkProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SimplePointer.h b/src/include/ipxe/efi/Protocol/SimplePointer.h index 1381b7ec1..ef435914b 100644 --- a/src/include/ipxe/efi/Protocol/SimplePointer.h +++ b/src/include/ipxe/efi/Protocol/SimplePointer.h @@ -8,8 +8,7 @@ **/ -#ifndef __SIMPLE_POINTER_H__ -#define __SIMPLE_POINTER_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -136,5 +135,3 @@ struct _EFI_SIMPLE_POINTER_PROTOCOL { }; extern EFI_GUID gEfiSimplePointerProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SimpleTextIn.h b/src/include/ipxe/efi/Protocol/SimpleTextIn.h index 1198ff81a..500db553e 100644 --- a/src/include/ipxe/efi/Protocol/SimpleTextIn.h +++ b/src/include/ipxe/efi/Protocol/SimpleTextIn.h @@ -9,8 +9,7 @@ **/ -#ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__ -#define __SIMPLE_TEXT_IN_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -127,5 +126,3 @@ struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL { }; extern EFI_GUID gEfiSimpleTextInProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SimpleTextInEx.h b/src/include/ipxe/efi/Protocol/SimpleTextInEx.h index f797a45c9..f28c5b594 100644 --- a/src/include/ipxe/efi/Protocol/SimpleTextInEx.h +++ b/src/include/ipxe/efi/Protocol/SimpleTextInEx.h @@ -10,8 +10,7 @@ **/ -#ifndef __SIMPLE_TEXT_IN_EX_H__ -#define __SIMPLE_TEXT_IN_EX_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -312,5 +311,3 @@ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { }; extern EFI_GUID gEfiSimpleTextInputExProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/SimpleTextOut.h b/src/include/ipxe/efi/Protocol/SimpleTextOut.h index 349e9debe..ba7e4193a 100644 --- a/src/include/ipxe/efi/Protocol/SimpleTextOut.h +++ b/src/include/ipxe/efi/Protocol/SimpleTextOut.h @@ -11,8 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __SIMPLE_TEXT_OUT_H__ -#define __SIMPLE_TEXT_OUT_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -408,5 +407,3 @@ struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL { }; extern EFI_GUID gEfiSimpleTextOutProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/StorageSecurityCommand.h b/src/include/ipxe/efi/Protocol/StorageSecurityCommand.h index f00eb925c..b43059adf 100644 --- a/src/include/ipxe/efi/Protocol/StorageSecurityCommand.h +++ b/src/include/ipxe/efi/Protocol/StorageSecurityCommand.h @@ -10,8 +10,7 @@ **/ -#ifndef __STORAGE_SECURITY_COMMAND_H__ -#define __STORAGE_SECURITY_COMMAND_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -209,5 +208,3 @@ struct _EFI_STORAGE_SECURITY_COMMAND_PROTOCOL { }; extern EFI_GUID gEfiStorageSecurityCommandProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Supplicant.h b/src/include/ipxe/efi/Protocol/Supplicant.h index 51a568335..09f2b055a 100644 --- a/src/include/ipxe/efi/Protocol/Supplicant.h +++ b/src/include/ipxe/efi/Protocol/Supplicant.h @@ -9,8 +9,7 @@ **/ -#ifndef __EFI_SUPPLICANT_PROTOCOL_H__ -#define __EFI_SUPPLICANT_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -457,5 +456,3 @@ struct _EFI_SUPPLICANT_PROTOCOL { extern EFI_GUID gEfiSupplicantServiceBindingProtocolGuid; extern EFI_GUID gEfiSupplicantProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Tcg2Protocol.h b/src/include/ipxe/efi/Protocol/Tcg2Protocol.h index 4333211b6..2d96718e1 100644 --- a/src/include/ipxe/efi/Protocol/Tcg2Protocol.h +++ b/src/include/ipxe/efi/Protocol/Tcg2Protocol.h @@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __TCG2_PROTOCOL_H__ -#define __TCG2_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -334,5 +333,3 @@ typedef struct tdEFI_TCG2_FINAL_EVENTS_TABLE { } EFI_TCG2_FINAL_EVENTS_TABLE; #define EFI_TCG2_FINAL_EVENTS_TABLE_VERSION 1 - -#endif diff --git a/src/include/ipxe/efi/Protocol/TcgService.h b/src/include/ipxe/efi/Protocol/TcgService.h index 88b9f0ea9..3a355fecc 100644 --- a/src/include/ipxe/efi/Protocol/TcgService.h +++ b/src/include/ipxe/efi/Protocol/TcgService.h @@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef _TCG_SERVICE_PROTOCOL_H_ -#define _TCG_SERVICE_PROTOCOL_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -194,5 +193,3 @@ struct _EFI_TCG_PROTOCOL { }; extern EFI_GUID gEfiTcgProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Tcp4.h b/src/include/ipxe/efi/Protocol/Tcp4.h index eeecd366d..27bdce452 100644 --- a/src/include/ipxe/efi/Protocol/Tcp4.h +++ b/src/include/ipxe/efi/Protocol/Tcp4.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_TCP4_PROTOCOL_H__ -#define __EFI_TCP4_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -566,5 +565,3 @@ struct _EFI_TCP4_PROTOCOL { extern EFI_GUID gEfiTcp4ServiceBindingProtocolGuid; extern EFI_GUID gEfiTcp4ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Tcp6.h b/src/include/ipxe/efi/Protocol/Tcp6.h index df0ed6500..2aeefa1b6 100644 --- a/src/include/ipxe/efi/Protocol/Tcp6.h +++ b/src/include/ipxe/efi/Protocol/Tcp6.h @@ -12,8 +12,7 @@ **/ -#ifndef __EFI_TCP6_PROTOCOL_H__ -#define __EFI_TCP6_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -855,5 +854,3 @@ struct _EFI_TCP6_PROTOCOL { extern EFI_GUID gEfiTcp6ServiceBindingProtocolGuid; extern EFI_GUID gEfiTcp6ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Udp4.h b/src/include/ipxe/efi/Protocol/Udp4.h index 7e8cc68c9..9ea5f14a8 100644 --- a/src/include/ipxe/efi/Protocol/Udp4.h +++ b/src/include/ipxe/efi/Protocol/Udp4.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_UDP4_PROTOCOL_H__ -#define __EFI_UDP4_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -436,5 +435,3 @@ struct _EFI_UDP4_PROTOCOL { extern EFI_GUID gEfiUdp4ServiceBindingProtocolGuid; extern EFI_GUID gEfiUdp4ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Udp6.h b/src/include/ipxe/efi/Protocol/Udp6.h index 4f176b8db..606cf8d21 100644 --- a/src/include/ipxe/efi/Protocol/Udp6.h +++ b/src/include/ipxe/efi/Protocol/Udp6.h @@ -11,8 +11,7 @@ **/ -#ifndef __EFI_UDP6_PROTOCOL_H__ -#define __EFI_UDP6_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -573,5 +572,3 @@ struct _EFI_UDP6_PROTOCOL { extern EFI_GUID gEfiUdp6ServiceBindingProtocolGuid; extern EFI_GUID gEfiUdp6ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/UnicodeCollation.h b/src/include/ipxe/efi/Protocol/UnicodeCollation.h index 96933d006..590840f19 100644 --- a/src/include/ipxe/efi/Protocol/UnicodeCollation.h +++ b/src/include/ipxe/efi/Protocol/UnicodeCollation.h @@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UNICODE_COLLATION_H__ -#define __UNICODE_COLLATION_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -169,5 +168,3 @@ struct _EFI_UNICODE_COLLATION_PROTOCOL { }; extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/Usb2HostController.h b/src/include/ipxe/efi/Protocol/Usb2HostController.h index 4ef2a0cc6..7323fd03b 100644 --- a/src/include/ipxe/efi/Protocol/Usb2HostController.h +++ b/src/include/ipxe/efi/Protocol/Usb2HostController.h @@ -9,8 +9,7 @@ **/ -#ifndef _USB2_HOSTCONTROLLER_H_ -#define _USB2_HOSTCONTROLLER_H_ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -656,5 +655,3 @@ struct _EFI_USB2_HC_PROTOCOL { }; extern EFI_GUID gEfiUsb2HcProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/UsbIo.h b/src/include/ipxe/efi/Protocol/UsbIo.h index 7686f241e..ccba28dcc 100644 --- a/src/include/ipxe/efi/Protocol/UsbIo.h +++ b/src/include/ipxe/efi/Protocol/UsbIo.h @@ -10,8 +10,7 @@ **/ -#ifndef __USB_IO_H__ -#define __USB_IO_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -504,5 +503,3 @@ struct _EFI_USB_IO_PROTOCOL { }; extern EFI_GUID gEfiUsbIoProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/VlanConfig.h b/src/include/ipxe/efi/Protocol/VlanConfig.h index aa163ab95..b7525d773 100644 --- a/src/include/ipxe/efi/Protocol/VlanConfig.h +++ b/src/include/ipxe/efi/Protocol/VlanConfig.h @@ -9,8 +9,7 @@ **/ -#ifndef __EFI_VLANCONFIG_PROTOCOL_H__ -#define __EFI_VLANCONFIG_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -133,5 +132,3 @@ struct _EFI_VLAN_CONFIG_PROTOCOL { }; extern EFI_GUID gEfiVlanConfigProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/Protocol/WiFi2.h b/src/include/ipxe/efi/Protocol/WiFi2.h index 016e6f588..eb687b245 100644 --- a/src/include/ipxe/efi/Protocol/WiFi2.h +++ b/src/include/ipxe/efi/Protocol/WiFi2.h @@ -9,8 +9,7 @@ **/ -#ifndef __EFI_WIFI2_PROTOCOL_H__ -#define __EFI_WIFI2_PROTOCOL_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -406,5 +405,3 @@ struct _EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL { }; extern EFI_GUID gEfiWiFi2ProtocolGuid; - -#endif diff --git a/src/include/ipxe/efi/RiscV64/ProcessorBind.h b/src/include/ipxe/efi/RiscV64/ProcessorBind.h index 7b3122fc2..c83b53eec 100644 --- a/src/include/ipxe/efi/RiscV64/ProcessorBind.h +++ b/src/include/ipxe/efi/RiscV64/ProcessorBind.h @@ -7,8 +7,7 @@ **/ -#ifndef PROCESSOR_BIND_H__ -#define PROCESSOR_BIND_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -172,5 +171,3 @@ typedef INT64 INTN __attribute__ ((aligned (8))); #ifndef __USER_LABEL_PREFIX__ #define __USER_LABEL_PREFIX__ #endif - -#endif diff --git a/src/include/ipxe/efi/Uefi.h b/src/include/ipxe/efi/Uefi.h index 4b8aad331..9a7fede7a 100644 --- a/src/include/ipxe/efi/Uefi.h +++ b/src/include/ipxe/efi/Uefi.h @@ -11,13 +11,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __PI_UEFI_H__ -#define __PI_UEFI_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); #include #include - -#endif diff --git a/src/include/ipxe/efi/Uefi/UefiBaseType.h b/src/include/ipxe/efi/Uefi/UefiBaseType.h index 80560ed97..eab46477f 100644 --- a/src/include/ipxe/efi/Uefi/UefiBaseType.h +++ b/src/include/ipxe/efi/Uefi/UefiBaseType.h @@ -10,13 +10,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UEFI_BASETYPE_H__ -#define __UEFI_BASETYPE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); -#include +#ifndef __UEFI_BASETYPE_H__ +#define __UEFI_BASETYPE_H__ + + #include // // Basic data type definitions introduced in UEFI. @@ -253,42 +255,42 @@ typedef union { #define EFI_IMAGE_MACHINE_LOONGARCH32 0x6232 #define EFI_IMAGE_MACHINE_LOONGARCH64 0x6264 -#if !defined (EFI_IMAGE_MACHINE_TYPE_VALUE) && !defined (EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE) - #if defined (MDE_CPU_IA32) + #if !defined (EFI_IMAGE_MACHINE_TYPE_VALUE) && !defined (EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE) + #if defined (MDE_CPU_IA32) #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ ((Machine) == EFI_IMAGE_MACHINE_IA32) #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_X64) - #elif defined (MDE_CPU_X64) + #elif defined (MDE_CPU_X64) #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ ((Machine) == EFI_IMAGE_MACHINE_X64) #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32) - #elif defined (MDE_CPU_AARCH64) + #elif defined (MDE_CPU_AARCH64) #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ ((Machine) == EFI_IMAGE_MACHINE_AARCH64) #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) - #elif defined (MDE_CPU_RISCV64) + #elif defined (MDE_CPU_RISCV64) #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ ((Machine) == EFI_IMAGE_MACHINE_RISCV64) #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) - #elif defined (MDE_CPU_LOONGARCH64) + #elif defined (MDE_CPU_LOONGARCH64) #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ ((Machine) == EFI_IMAGE_MACHINE_LOONGARCH64) #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) - #elif defined (MDE_CPU_EBC) + #elif defined (MDE_CPU_EBC) /// /// This is just to make sure you can cross compile with the EBC compiler. @@ -298,20 +300,20 @@ typedef union { #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) + #else + #error Unknown Processor Type + #endif #else - #error Unknown Processor Type - #endif -#else - #if defined (EFI_IMAGE_MACHINE_TYPE_VALUE) + #if defined (EFI_IMAGE_MACHINE_TYPE_VALUE) #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_TYPE_VALUE) - #else + #else #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) (FALSE) - #endif - #if defined (EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE) + #endif + #if defined (EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE) #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE) - #else + #else #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) + #endif #endif -#endif #endif diff --git a/src/include/ipxe/efi/Uefi/UefiGpt.h b/src/include/ipxe/efi/Uefi/UefiGpt.h index 4699edee5..da385a5ba 100644 --- a/src/include/ipxe/efi/Uefi/UefiGpt.h +++ b/src/include/ipxe/efi/Uefi/UefiGpt.h @@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UEFI_GPT_H__ -#define __UEFI_GPT_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -137,4 +136,3 @@ typedef struct { } EFI_PARTITION_ENTRY; #pragma pack() -#endif diff --git a/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h b/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h index 700cb4693..5341f3431 100644 --- a/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h +++ b/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h @@ -12,13 +12,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UEFI_INTERNAL_FORMREPRESENTATION_H__ -#define __UEFI_INTERNAL_FORMREPRESENTATION_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); -#include +#ifndef __UEFI_INTERNAL_FORMREPRESENTATION_H__ +#define __UEFI_INTERNAL_FORMREPRESENTATION_H__ + + #include /// /// The following types are currently defined: @@ -36,7 +38,7 @@ typedef UINT16 EFI_DEFAULT_ID; typedef UINT32 EFI_HII_FONT_STYLE; -#pragma pack(1) + #pragma pack(1) // // Definitions for Package Lists and Package Headers @@ -2118,7 +2120,7 @@ typedef struct _EFI_HII_AIBT_SKIP2_BLOCK { UINT16 SkipCount; } EFI_HII_AIBT_SKIP2_BLOCK; -#pragma pack() + #pragma pack() /// /// References to string tokens must use this macro to enable scanning for diff --git a/src/include/ipxe/efi/Uefi/UefiMultiPhase.h b/src/include/ipxe/efi/Uefi/UefiMultiPhase.h index 9584f152d..34d9e950f 100644 --- a/src/include/ipxe/efi/Uefi/UefiMultiPhase.h +++ b/src/include/ipxe/efi/Uefi/UefiMultiPhase.h @@ -6,12 +6,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UEFI_MULTIPHASE_H__ -#define __UEFI_MULTIPHASE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); +#ifndef __UEFI_MULTIPHASE_H__ +#define __UEFI_MULTIPHASE_H__ + /// /// Attributes of variable. /// @@ -33,8 +35,8 @@ FILE_SECBOOT ( PERMITTED ); /// #define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x00000010 -#ifndef VFRCOMPILE - #include + #ifndef VFRCOMPILE + #include /// /// Enumeration of memory types introduced in UEFI. /// @@ -247,6 +249,6 @@ typedef struct { /// WIN_CERTIFICATE_UEFI_GUID AuthInfo; } EFI_VARIABLE_AUTHENTICATION_2; -#endif // VFRCOMPILE + #endif // VFRCOMPILE #endif diff --git a/src/include/ipxe/efi/Uefi/UefiPxe.h b/src/include/ipxe/efi/Uefi/UefiPxe.h index 54c90f19c..6e70baf53 100644 --- a/src/include/ipxe/efi/Uefi/UefiPxe.h +++ b/src/include/ipxe/efi/Uefi/UefiPxe.h @@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __EFI_PXE_H__ -#define __EFI_PXE_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -1779,5 +1778,3 @@ typedef struct s_pxe_db_receive { } PXE_DB_RECEIVE; #pragma pack() - -#endif diff --git a/src/include/ipxe/efi/Uefi/UefiSpec.h b/src/include/ipxe/efi/Uefi/UefiSpec.h index 824e8dba6..ee14f4d17 100644 --- a/src/include/ipxe/efi/Uefi/UefiSpec.h +++ b/src/include/ipxe/efi/Uefi/UefiSpec.h @@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UEFI_SPEC_H__ -#define __UEFI_SPEC_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -2301,5 +2300,3 @@ typedef struct { #include #include #include - -#endif diff --git a/src/include/ipxe/efi/X64/ProcessorBind.h b/src/include/ipxe/efi/X64/ProcessorBind.h index fd8c04484..c1270c214 100644 --- a/src/include/ipxe/efi/X64/ProcessorBind.h +++ b/src/include/ipxe/efi/X64/ProcessorBind.h @@ -6,8 +6,7 @@ **/ -#ifndef __PROCESSOR_BIND_H__ -#define __PROCESSOR_BIND_H__ +#pragma once FILE_LICENCE ( BSD2_PATENT ); FILE_SECBOOT ( PERMITTED ); @@ -318,5 +317,3 @@ typedef INT64 INTN; #ifndef __USER_LABEL_PREFIX__ #define __USER_LABEL_PREFIX__ #endif - -#endif diff --git a/src/include/ipxe/efi/import.pl b/src/include/ipxe/efi/import.pl index 9490e2f7b..507499d41 100755 --- a/src/include/ipxe/efi/import.pl +++ b/src/include/ipxe/efi/import.pl @@ -78,9 +78,13 @@ sub try_import_file { # Write out line print $outfh "$_\n"; # Apply FILE_LICENCE()/FILE_SECBOOT() immediately after include guard - if ( defined $maybe_guard && ! defined $guard ) { - if ( /^\#define\s+${maybe_guard}$/ ) { + if ( ! defined $guard ) { + if ( /^\#pragma\s+once$/ ) { + $guard = $_; + } elsif ( defined $maybe_guard && /^\#define\s+${maybe_guard}$/ ) { $guard = $maybe_guard; + } + if ( defined $guard ) { print $outfh "\n"; print $outfh "FILE_LICENCE ( $licence );\n" if $licence; print $outfh "FILE_SECBOOT ( PERMITTED );\n";