[efi] Update to current EDK2 headers

Signed-off-by: Michael Brown <mcb30@ipxe.org>

src/include/ipxe/efi/AArch64/ProcessorBind.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __PROCESSOR_BIND_H__
+#pragma once
-#define __PROCESSOR_BIND_H__
 
 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__)    ;\
+         .global  ASM_PFX(func__)    ;\
-         .type ASM_PFX(func__), %function
+         _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

src/include/ipxe/efi/Base.h

@@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __BASE_H__
+#pragma once
-#define __BASE_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -1394,5 +1393,3 @@ _ReturnAddress (
 
 **/
 #define ARRAY_SIZE(Array)  (sizeof (Array) / sizeof ((Array)[0]))
-
-#endif

src/include/ipxe/efi/Guid/Acpi.h

@@ -13,8 +13,7 @@
 
 **/
 
-#ifndef __ACPI_GUID_H__
+#pragma once
-#define __ACPI_GUID_H__
 
 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

src/include/ipxe/efi/Guid/Fdt.h

@@ -6,8 +6,7 @@
 *
 **/
 
-#ifndef __FDT_H__
+#pragma once
-#define __FDT_H__
 
 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__ */

src/include/ipxe/efi/Guid/FileInfo.h

@@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __FILE_INFO_H__
+#pragma once
-#define __FILE_INFO_H__
 
 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

src/include/ipxe/efi/Guid/FileSystemInfo.h

@@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __FILE_SYSTEM_INFO_H__
+#pragma once
-#define __FILE_SYSTEM_INFO_H__
 
 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

src/include/ipxe/efi/Guid/GlobalVariable.h

@@ -8,8 +8,7 @@
   GUID defined in UEFI 2.1
 **/
 
-#ifndef __GLOBAL_VARIABLE_GUID_H__
+#pragma once
-#define __GLOBAL_VARIABLE_GUID_H__
 
 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

src/include/ipxe/efi/Guid/HiiFormMapMethodGuid.h

@@ -8,8 +8,7 @@
   GUID defined in UEFI 2.2 spec.
 **/
 
-#ifndef __EFI_HII_FORMMAP_GUID_H__
+#pragma once
-#define __EFI_HII_FORMMAP_GUID_H__
 
 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

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__
+#pragma once
-#define __HII_PLATFORM_SETUP_FORMSET_GUID_H__
 
 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

src/include/ipxe/efi/Guid/ImageAuthentication.h

@@ -8,8 +8,7 @@
   GUIDs defined in UEFI 2.5 spec.
 **/
 
-#ifndef __IMAGE_AUTHTICATION_H__
+#pragma once
-#define __IMAGE_AUTHTICATION_H__
 
 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

src/include/ipxe/efi/Guid/MdeModuleHii.h

@@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __MDEMODULE_HII_H__
+#pragma once
-#define __MDEMODULE_HII_H__
 
 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

src/include/ipxe/efi/Guid/MicrosoftVendor.h

@@ -16,8 +16,7 @@
     <https://msdn.microsoft.com/en-us/ie/dn932805(v=vs.94)>.
 **/
 
-#ifndef MICROSOFT_VENDOR_H_
+#pragma once
-#define MICROSOFT_VENDOR_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -54,5 +53,3 @@ FILE_SECBOOT ( PERMITTED );
   }
 
 extern EFI_GUID  gMicrosoftVendorGuid;
-
-#endif /* MICROSOFT_VENDOR_H_ */

src/include/ipxe/efi/Guid/PcAnsi.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __PC_ANSI_H__
+#pragma once
-#define __PC_ANSI_H__
 
 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

src/include/ipxe/efi/Guid/Rng.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef RNG_GUID_H_
+#pragma once
-#define RNG_GUID_H_
 
 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_

src/include/ipxe/efi/Guid/SmBios.h

@@ -13,8 +13,7 @@
 
 **/
 
-#ifndef __SMBIOS_GUID_H__
+#pragma once
-#define __SMBIOS_GUID_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -31,5 +30,3 @@ FILE_SECBOOT ( PERMITTED );
 
 extern EFI_GUID  gEfiSmbiosTableGuid;
 extern EFI_GUID  gEfiSmbios3TableGuid;
-
-#endif

src/include/ipxe/efi/Guid/TlsAuthentication.h

@@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __TLS_AUTHENTICATION_H__
+#pragma once
-#define __TLS_AUTHENTICATION_H__
 
 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

src/include/ipxe/efi/Guid/WinCertificate.h

@@ -8,8 +8,7 @@
   GUID defined in UEFI 2.0 spec.
 **/
 
-#ifndef __EFI_WIN_CERTIFICATE_H__
+#pragma once
-#define __EFI_WIN_CERTIFICATE_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -119,5 +118,3 @@ typedef struct {
 } WIN_CERTIFICATE_EFI_PKCS1_15;
 
 extern EFI_GUID  gEfiCertTypeRsa2048Sha256Guid;
-
-#endif

src/include/ipxe/efi/Ia32/ProcessorBind.h

@@ -6,8 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PROCESSOR_BIND_H__
+#pragma once
-#define __PROCESSOR_BIND_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -314,5 +313,3 @@ typedef INT32 INTN;
 #ifndef __USER_LABEL_PREFIX__
 #define __USER_LABEL_PREFIX__  _
 #endif
-
-#endif

src/include/ipxe/efi/IndustryStandard/Acpi10.h

@@ -6,8 +6,7 @@ Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_1_0_H_
+#pragma once
-#define _ACPI_1_0_H_
 
 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

src/include/ipxe/efi/IndustryStandard/Acpi20.h

@@ -5,8 +5,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_2_0_H_
+#pragma once
-#define _ACPI_2_0_H_
 
 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

src/include/ipxe/efi/IndustryStandard/Acpi30.h

@@ -6,8 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_3_0_H_
+#pragma once
-#define _ACPI_3_0_H_
 
 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

src/include/ipxe/efi/IndustryStandard/Acpi40.h

@@ -6,8 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_4_0_H_
+#pragma once
-#define _ACPI_4_0_H_
 
 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

src/include/ipxe/efi/IndustryStandard/Acpi50.h

@@ -8,8 +8,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_5_0_H_
+#pragma once
-#define _ACPI_5_0_H_
 
 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_SUPPORTED                          BIT0
-#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_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

src/include/ipxe/efi/IndustryStandard/Acpi51.h

@@ -9,8 +9,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_5_1_H_
+#pragma once
-#define _ACPI_5_1_H_
 
 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_SUPPORTED                          BIT0
-#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_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

src/include/ipxe/efi/IndustryStandard/Acpi60.h

@@ -8,8 +8,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _ACPI_6_0_H_
+#pragma once
-#define _ACPI_6_0_H_
 
 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_SUPPORTED                          BIT0
-#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_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

src/include/ipxe/efi/IndustryStandard/AcpiAml.h

@@ -3,12 +3,12 @@
 
   Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
+  Copyright (C) 2026, Advanced Micro Devices, Inc. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _ACPI_AML_H_
+#pragma once
-#define _ACPI_AML_H_
 
 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

src/include/ipxe/efi/IndustryStandard/Bluetooth.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef _BLUETOOTH_H_
+#pragma once
-#define _BLUETOOTH_H_
 
 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

src/include/ipxe/efi/IndustryStandard/Pci22.h

@@ -13,8 +13,7 @@
 
 **/
 
-#ifndef _PCI22_H_
+#pragma once
-#define _PCI22_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -877,5 +876,3 @@ typedef union {
 } EFI_PCI_ROM_HEADER;
 
 #pragma pack()
-
-#endif

src/include/ipxe/efi/IndustryStandard/PeImage.h

@@ -16,8 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PE_IMAGE_H__
+#pragma once
-#define __PE_IMAGE_H__
 
 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

src/include/ipxe/efi/IndustryStandard/Tpm12.h

@@ -6,8 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef _TPM12_H_
+#pragma once
-#define _TPM12_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -2164,5 +2163,3 @@ typedef struct tdTPM_RSP_COMMAND_HDR {
 } TPM_RSP_COMMAND_HDR;
 
 #pragma pack ()
-
-#endif

src/include/ipxe/efi/IndustryStandard/Tpm20.h

@@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _TPM20_H_
+#pragma once
-#define _TPM20_H_
 
 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

src/include/ipxe/efi/IndustryStandard/UefiTcgPlatform.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef __UEFI_TCG_PLATFORM_H__
+#pragma once
-#define __UEFI_TCG_PLATFORM_H__
 
 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

src/include/ipxe/efi/IndustryStandard/Usb.h

@@ -8,8 +8,7 @@
 
 **/
 
-#ifndef __USB_H__
+#pragma once
-#define __USB_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -396,5 +395,3 @@ typedef struct hid_descriptor {
 } EFI_USB_HID_DESCRIPTOR;
 
 #pragma pack()
-
-#endif

src/include/ipxe/efi/Library/BaseLib.h

@@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __BASE_LIB__
+#pragma once
-#define __BASE_LIB__
 
 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__)

src/include/ipxe/efi/LoongArch64/ProcessorBind.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef PROCESSOR_BIND_H_
+#pragma once
-#define PROCESSOR_BIND_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -119,5 +118,3 @@ typedef INT64 INTN;
 #ifndef __USER_LABEL_PREFIX__
 #define __USER_LABEL_PREFIX__
 #endif
-
-#endif

src/include/ipxe/efi/Pi/PiBootMode.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __PI_BOOT_MODE_H__
+#pragma once
-#define __PI_BOOT_MODE_H__
 
 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

src/include/ipxe/efi/Pi/PiDependency.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __PI_DEPENDENCY_H__
+#pragma once
-#define __PI_DEPENDENCY_H__
 
 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

src/include/ipxe/efi/Pi/PiDxeCis.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PI_DXECIS_H__
+#pragma once
-#define __PI_DXECIS_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -739,5 +738,3 @@ typedef struct {
 } DXE_SERVICES;
 
 typedef DXE_SERVICES EFI_DXE_SERVICES;
-
-#endif

src/include/ipxe/efi/Pi/PiFirmwareFile.h

@@ -9,13 +9,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PI_FIRMWARE_FILE_H__
+#pragma once
-#define __PI_FIRMWARE_FILE_H__
 
 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

src/include/ipxe/efi/Pi/PiFirmwareVolume.h

@@ -9,12 +9,14 @@
 
 **/
 
-#ifndef __PI_FIRMWAREVOLUME_H__
+#pragma once
-#define __PI_FIRMWAREVOLUME_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
 
+#ifndef __PI_FIRMWAREVOLUME_H__
+#define __PI_FIRMWAREVOLUME_H__
+
 ///
 /// EFI_FV_FILE_ATTRIBUTES
 ///

src/include/ipxe/efi/Pi/PiHob.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PI_HOB_H__
+#pragma once
-#define __PI_HOB_H__
 
 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

src/include/ipxe/efi/Pi/PiMultiPhase.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PI_MULTIPHASE_H__
+#pragma once
-#define __PI_MULTIPHASE_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -268,5 +267,3 @@ EFI_STATUS
   );
 
 extern EFI_GUID  gEfiMmCommunicateHeaderV3Guid;
-
-#endif

src/include/ipxe/efi/Pi/PiS3BootScript.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef _PI_S3_BOOT_SCRIPT_H_
+#pragma once
-#define _PI_S3_BOOT_SCRIPT_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -52,5 +51,3 @@ typedef enum {
   EfiBootScriptWidthFillUint64,
   EfiBootScriptWidthMaximum
 } EFI_BOOT_SCRIPT_WIDTH;
-
-#endif

src/include/ipxe/efi/Pi/PiStatusCode.h

@@ -11,8 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PI_STATUS_CODE_H__
+#pragma once
-#define __PI_STATUS_CODE_H__
 
 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

src/include/ipxe/efi/PiDxe.h

@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PI_DXE_H__
+#pragma once
-#define __PI_DXE_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -17,5 +16,3 @@ FILE_SECBOOT ( PERMITTED );
 #include <ipxe/efi/Uefi/UefiSpec.h>
 
 #include <ipxe/efi/Pi/PiDxeCis.h>
-
-#endif

src/include/ipxe/efi/Protocol/AbsolutePointer.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __ABSOLUTE_POINTER_H__
+#pragma once
-#define __ABSOLUTE_POINTER_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -191,5 +190,3 @@ struct _EFI_ABSOLUTE_POINTER_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiAbsolutePointerProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/AcpiTable.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __ACPI_TABLE_H___
+#pragma once
-#define __ACPI_TABLE_H___
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -120,5 +119,3 @@ struct _EFI_ACPI_TABLE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiAcpiTableProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/AdapterInformation.h

@@ -11,8 +11,7 @@
 
 **/
 
-#ifndef __EFI_ADAPTER_INFORMATION_PROTOCOL_H__
+#pragma once
-#define __EFI_ADAPTER_INFORMATION_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -254,5 +253,3 @@ extern EFI_GUID  gEfiAdapterInfoNetworkBootGuid;
 extern EFI_GUID  gEfiAdapterInfoSanMacAddressGuid;
 
 extern EFI_GUID  gEfiAdapterInfoUndiIpv6SupportGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Arp.h

@@ -15,8 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_ARP_PROTOCOL_H__
+#pragma once
-#define __EFI_ARP_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -375,5 +374,3 @@ struct _EFI_ARP_PROTOCOL {
 
 extern EFI_GUID  gEfiArpServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiArpProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/BlockIo.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __BLOCK_IO_H__
+#pragma once
-#define __BLOCK_IO_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -233,5 +232,3 @@ struct _EFI_BLOCK_IO_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiBlockIoProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/BlockIo2.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __BLOCK_IO2_H__
+#pragma once
-#define __BLOCK_IO2_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -196,5 +195,3 @@ struct _EFI_BLOCK_IO2_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiBlockIo2ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/BusSpecificDriverOverride.h

@@ -11,8 +11,7 @@
 
 **/
 
-#ifndef _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL_H_
+#pragma once
-#define _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -65,5 +64,3 @@ struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiBusSpecificDriverOverrideProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/ComponentName.h

@@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_COMPONENT_NAME_H__
+#pragma once
-#define __EFI_COMPONENT_NAME_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -120,5 +119,3 @@ struct _EFI_COMPONENT_NAME_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiComponentNameProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/ComponentName2.h

@@ -8,8 +8,7 @@
 
 **/
 
-#ifndef __EFI_COMPONENT_NAME2_H__
+#pragma once
-#define __EFI_COMPONENT_NAME2_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -163,5 +162,3 @@ struct _EFI_COMPONENT_NAME2_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiComponentName2ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/DebugSupport.h

@@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __DEBUG_SUPPORT_H__
+#pragma once
-#define __DEBUG_SUPPORT_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -964,5 +963,3 @@ struct _EFI_DEBUG_SUPPORT_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiDebugSupportProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/DevicePath.h

@@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_DEVICE_PATH_PROTOCOL_H__
+#pragma once
-#define __EFI_DEVICE_PATH_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/DevicePathToText.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef __DEVICE_PATH_TO_TEXT_PROTOCOL_H__
+#pragma once
-#define __DEVICE_PATH_TO_TEXT_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -76,5 +75,3 @@ typedef struct {
 } EFI_DEVICE_PATH_TO_TEXT_PROTOCOL;
 
 extern EFI_GUID  gEfiDevicePathToTextProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Dhcp4.h

@@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_DHCP4_PROTOCOL_H__
+#pragma once
-#define __EFI_DHCP4_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -761,5 +760,3 @@ struct _EFI_DHCP4_PROTOCOL {
 
 extern EFI_GUID  gEfiDhcp4ProtocolGuid;
 extern EFI_GUID  gEfiDhcp4ServiceBindingProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Dhcp6.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __EFI_DHCP6_PROTOCOL_H__
+#pragma once
-#define __EFI_DHCP6_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -779,5 +778,3 @@ struct _EFI_DHCP6_PROTOCOL {
 
 extern EFI_GUID  gEfiDhcp6ProtocolGuid;
 extern EFI_GUID  gEfiDhcp6ServiceBindingProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/DiskIo.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __DISK_IO_H__
+#pragma once
-#define __DISK_IO_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -110,5 +109,3 @@ struct _EFI_DISK_IO_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiDiskIoProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Dns4.h

@@ -12,8 +12,7 @@
 
 **/
 
-#ifndef __EFI_DNS4_PROTOCOL_H__
+#pragma once
-#define __EFI_DNS4_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -535,5 +534,3 @@ struct _EFI_DNS4_PROTOCOL {
 
 extern EFI_GUID  gEfiDns4ServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiDns4ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Dns6.h

@@ -12,8 +12,7 @@
 
 **/
 
-#ifndef __EFI_DNS6_PROTOCOL_H__
+#pragma once
-#define __EFI_DNS6_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -532,5 +531,3 @@ struct _EFI_DNS6_PROTOCOL {
 
 extern EFI_GUID  gEfiDns6ServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiDns6ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/DriverBinding.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_DRIVER_BINDING_H__
+#pragma once
-#define __EFI_DRIVER_BINDING_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -194,5 +193,3 @@ struct _EFI_DRIVER_BINDING_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiDriverBindingProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/EapConfiguration.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __EFI_EAP_CONFIGURATION_PROTOCOL_H__
+#pragma once
-#define __EFI_EAP_CONFIGURATION_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -152,5 +151,3 @@ struct _EFI_EAP_CONFIGURATION_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiEapConfigurationProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/FormBrowser2.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_FORM_BROWSER2_H__
+#pragma once
-#define __EFI_FORM_BROWSER2_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -171,5 +170,3 @@ struct _EFI_FORM_BROWSER2_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiFormBrowser2ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/GraphicsOutput.h

@@ -8,8 +8,7 @@
 
 **/
 
-#ifndef __GRAPHICS_OUTPUT_H__
+#pragma once
-#define __GRAPHICS_OUTPUT_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -269,5 +268,3 @@ struct _EFI_GRAPHICS_OUTPUT_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiGraphicsOutputProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Hash.h

@@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_HASH_PROTOCOL_H__
+#pragma once
-#define __EFI_HASH_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/HiiConfigAccess.h

@@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_HII_CONFIG_ACCESS_H__
+#pragma once
-#define __EFI_HII_CONFIG_ACCESS_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -222,5 +221,3 @@ struct _EFI_HII_CONFIG_ACCESS_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiHiiConfigAccessProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/HiiDatabase.h

@@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __HII_DATABASE_H__
+#pragma once
-#define __HII_DATABASE_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -517,5 +516,3 @@ struct _EFI_HII_DATABASE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiHiiDatabaseProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/HiiFont.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __HII_FONT_H__
+#pragma once
-#define __HII_FONT_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -463,5 +462,3 @@ struct _EFI_HII_FONT_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiHiiFontProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/HiiImage.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __HII_IMAGE_H__
+#pragma once
-#define __HII_IMAGE_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -345,5 +344,3 @@ struct _EFI_HII_IMAGE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiHiiImageProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Http.h

@@ -13,8 +13,7 @@
 
 **/
 
-#ifndef __EFI_HTTP_PROTOCOL_H__
+#pragma once
-#define __EFI_HTTP_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -529,5 +528,3 @@ struct _EFI_HTTP_PROTOCOL {
 
 extern EFI_GUID  gEfiHttpServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiHttpProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Ip4.h

@@ -18,8 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_IP4_PROTOCOL_H__
+#pragma once
-#define __EFI_IP4_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -601,5 +600,3 @@ struct _EFI_IP4_PROTOCOL {
 
 extern EFI_GUID  gEfiIp4ServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiIp4ProtocolGuid;
-
-#endif

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__
+#pragma once
-#define __EFI_IP4CONFIG2_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -315,5 +314,3 @@ struct _EFI_IP4_CONFIG2_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiIp4Config2ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Ip6.h

@@ -18,8 +18,7 @@
 
 **/
 
-#ifndef __EFI_IP6_PROTOCOL_H__
+#pragma once
-#define __EFI_IP6_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -945,5 +944,3 @@ struct _EFI_IP6_PROTOCOL {
 
 extern EFI_GUID  gEfiIp6ServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiIp6ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Ip6Config.h

@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_IP6CONFIG_PROTOCOL_H__
+#pragma once
-#define __EFI_IP6CONFIG_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -366,5 +365,3 @@ struct _EFI_IP6_CONFIG_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiIp6ConfigProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/LoadFile.h

@@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_LOAD_FILE_PROTOCOL_H__
+#pragma once
-#define __EFI_LOAD_FILE_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -81,5 +80,3 @@ struct _EFI_LOAD_FILE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiLoadFileProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/LoadFile2.h

@@ -12,8 +12,7 @@
 
 **/
 
-#ifndef __EFI_LOAD_FILE2_PROTOCOL_H__
+#pragma once
-#define __EFI_LOAD_FILE2_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/LoadedImage.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __LOADED_IMAGE_PROTOCOL_H__
+#pragma once
-#define __LOADED_IMAGE_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/ManagedNetwork.h

@@ -10,8 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_MANAGED_NETWORK_PROTOCOL_H__
+#pragma once
-#define __EFI_MANAGED_NETWORK_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/MpService.h

@@ -36,8 +36,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _MP_SERVICE_PROTOCOL_H_
+#pragma once
-#define _MP_SERVICE_PROTOCOL_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -673,5 +672,3 @@ struct _EFI_MP_SERVICES_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiMpServiceProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Mtftp4.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_MTFTP4_PROTOCOL_H__
+#pragma once
-#define __EFI_MTFTP4_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -575,5 +574,3 @@ struct _EFI_MTFTP4_TOKEN {
 
 extern EFI_GUID  gEfiMtftp4ServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiMtftp4ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Mtftp6.h

@@ -13,8 +13,7 @@
 
 **/
 
-#ifndef __EFI_MTFTP6_PROTOCOL_H__
+#pragma once
-#define __EFI_MTFTP6_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -817,5 +816,3 @@ struct _EFI_MTFTP6_PROTOCOL {
 
 extern EFI_GUID  gEfiMtftp6ServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiMtftp6ProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h

@@ -9,8 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __EFI_NETWORK_INTERFACE_IDENTIFER_H__
+#pragma once
-#define __EFI_NETWORK_INTERFACE_IDENTIFER_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -109,5 +108,3 @@ struct undiconfig_table {
 
 extern EFI_GUID  gEfiNetworkInterfaceIdentifierProtocolGuid;
 extern EFI_GUID  gEfiNetworkInterfaceIdentifierProtocolGuid_31;
-
-#endif

src/include/ipxe/efi/Protocol/PciIo.h

@@ -7,8 +7,7 @@
 
 **/
 
-#ifndef __PCI_IO_H__
+#pragma once
-#define __PCI_IO_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -550,5 +549,3 @@ struct _EFI_PCI_IO_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiPciIoProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/PciRootBridgeIo.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __PCI_ROOT_BRIDGE_IO_H__
+#pragma once
-#define __PCI_ROOT_BRIDGE_IO_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -435,5 +434,3 @@ struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiPciRootBridgeIoProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/PxeBaseCode.h

@@ -13,8 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __PXE_BASE_CODE_PROTOCOL_H__
+#pragma once
-#define __PXE_BASE_CODE_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -930,5 +929,3 @@ struct _EFI_PXE_BASE_CODE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiPxeBaseCodeProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Rng.h

@@ -8,8 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef EFI_RNG_PROTOCOL_H_
+#pragma once
-#define EFI_RNG_PROTOCOL_H_
 
 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

src/include/ipxe/efi/Protocol/SerialIo.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __SERIAL_IO_PROTOCOL_H__
+#pragma once
-#define __SERIAL_IO_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/ServiceBinding.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __EFI_SERVICE_BINDING_H__
+#pragma once
-#define __EFI_SERVICE_BINDING_H__
 
 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

src/include/ipxe/efi/Protocol/SimpleFileSystem.h

@@ -12,8 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __SIMPLE_FILE_SYSTEM_H__
+#pragma once
-#define __SIMPLE_FILE_SYSTEM_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -552,5 +551,3 @@ struct _EFI_FILE_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiSimpleFileSystemProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/SimpleNetwork.h

@@ -17,8 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __SIMPLE_NETWORK_H__
+#pragma once
-#define __SIMPLE_NETWORK_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -674,5 +673,3 @@ struct _EFI_SIMPLE_NETWORK_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiSimpleNetworkProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/SimplePointer.h

@@ -8,8 +8,7 @@
 
 **/
 
-#ifndef __SIMPLE_POINTER_H__
+#pragma once
-#define __SIMPLE_POINTER_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -136,5 +135,3 @@ struct _EFI_SIMPLE_POINTER_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiSimplePointerProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/SimpleTextIn.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__
+#pragma once
-#define __SIMPLE_TEXT_IN_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -127,5 +126,3 @@ struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiSimpleTextInProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/SimpleTextInEx.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __SIMPLE_TEXT_IN_EX_H__
+#pragma once
-#define __SIMPLE_TEXT_IN_EX_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -312,5 +311,3 @@ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiSimpleTextInputExProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/SimpleTextOut.h

@@ -11,8 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __SIMPLE_TEXT_OUT_H__
+#pragma once
-#define __SIMPLE_TEXT_OUT_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -408,5 +407,3 @@ struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiSimpleTextOutProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/StorageSecurityCommand.h

@@ -10,8 +10,7 @@
 
 **/
 
-#ifndef __STORAGE_SECURITY_COMMAND_H__
+#pragma once
-#define __STORAGE_SECURITY_COMMAND_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -209,5 +208,3 @@ struct _EFI_STORAGE_SECURITY_COMMAND_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiStorageSecurityCommandProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Supplicant.h

@@ -9,8 +9,7 @@
 
 **/
 
-#ifndef __EFI_SUPPLICANT_PROTOCOL_H__
+#pragma once
-#define __EFI_SUPPLICANT_PROTOCOL_H__
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -457,5 +456,3 @@ struct _EFI_SUPPLICANT_PROTOCOL {
 
 extern EFI_GUID  gEfiSupplicantServiceBindingProtocolGuid;
 extern EFI_GUID  gEfiSupplicantProtocolGuid;
-
-#endif

src/include/ipxe/efi/Protocol/Tcg2Protocol.h

@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef __TCG2_PROTOCOL_H__
+#pragma once
-#define __TCG2_PROTOCOL_H__
 
 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

src/include/ipxe/efi/Protocol/TcgService.h

@@ -7,8 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#ifndef _TCG_SERVICE_PROTOCOL_H_
+#pragma once
-#define _TCG_SERVICE_PROTOCOL_H_
 
 FILE_LICENCE ( BSD2_PATENT );
 FILE_SECBOOT ( PERMITTED );
@@ -194,5 +193,3 @@ struct _EFI_TCG_PROTOCOL {
 };
 
 extern EFI_GUID  gEfiTcgProtocolGuid;
-
-#endif