From: Simon Glass <sjg@chromium.org> The declarations in efi_api.h are inconsistent. Tidy them up, so that the final 8 bytes appear on their own line aways. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) include/efi_api.h | 162 +++++++++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h index 9b795c2a20d..d81a4d96694 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -217,26 +217,26 @@ enum efi_reset_type { #define CAPSULE_SUPPORT_DEPENDENCY 0x0000000000000002 #define EFI_CAPSULE_REPORT_GUID \ - EFI_GUID(0x39b68c46, 0xf7fb, 0x441b, 0xb6, 0xec, \ - 0x16, 0xb0, 0xf6, 0x98, 0x21, 0xf3) + EFI_GUID(0x39b68c46, 0xf7fb, 0x441b, \ + 0xb6, 0xec, 0x16, 0xb0, 0xf6, 0x98, 0x21, 0xf3) #define EFI_MEMORY_RANGE_CAPSULE_GUID \ - EFI_GUID(0xde9f0ec, 0x88b6, 0x428f, 0x97, 0x7a, \ - 0x25, 0x8f, 0x1d, 0xe, 0x5e, 0x72) + EFI_GUID(0xde9f0ec, 0x88b6, 0x428f, \ + 0x97, 0x7a, 0x25, 0x8f, 0x1d, 0xe, 0x5e, 0x72) #define EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID \ - EFI_GUID(0x6dcbd5ed, 0xe82d, 0x4c44, 0xbd, 0xa1, \ - 0x71, 0x94, 0x19, 0x9a, 0xd9, 0x2a) + EFI_GUID(0x6dcbd5ed, 0xe82d, 0x4c44, \ + 0xbd, 0xa1, 0x71, 0x94, 0x19, 0x9a, 0xd9, 0x2a) #define EFI_CONFORMANCE_PROFILES_TABLE_GUID \ - EFI_GUID(0x36122546, 0xf7ef, 0x4c8f, 0xbd, 0x9b, \ - 0xeb, 0x85, 0x25, 0xb5, 0x0c, 0x0b) + EFI_GUID(0x36122546, 0xf7ef, 0x4c8f, \ + 0xbd, 0x9b, 0xeb, 0x85, 0x25, 0xb5, 0x0c, 0x0b) #define EFI_CONFORMANCE_PROFILES_TABLE_VERSION 1 #define EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID \ - EFI_GUID(0xcce33c35, 0x74ac, 0x4087, 0xbc, 0xe7, \ - 0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27) + EFI_GUID(0xcce33c35, 0x74ac, 0x4087, \ + 0xbc, 0xe7, 0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27) struct efi_conformance_profiles_table { u16 version; @@ -315,8 +315,8 @@ struct efi_capsule_result_variable_fmp { #define EFI_RT_SUPPORTED_QUERY_VARIABLE_INFO 0x2000 #define EFI_RT_PROPERTIES_TABLE_GUID \ - EFI_GUID(0xeb66918a, 0x7eef, 0x402a, 0x84, 0x2e, \ - 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9) + EFI_GUID(0xeb66918a, 0x7eef, 0x402a, \ + 0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9) #define EFI_RT_PROPERTIES_TABLE_VERSION 0x1 @@ -380,48 +380,48 @@ struct efi_runtime_services { /* EFI event group GUID definitions */ #define EFI_EVENT_GROUP_EXIT_BOOT_SERVICES \ - EFI_GUID(0x27abf055, 0xb1b8, 0x4c26, 0x80, 0x48, \ - 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf) + EFI_GUID(0x27abf055, 0xb1b8, 0x4c26, \ + 0x80, 0x48, 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf) #define EFI_EVENT_GROUP_BEFORE_EXIT_BOOT_SERVICES \ - EFI_GUID(0x8be0e274, 0x3970, 0x4b44, 0x80, 0xc5, \ - 0x1a, 0xb9, 0x50, 0x2f, 0x3b, 0xfc) + EFI_GUID(0x8be0e274, 0x3970, 0x4b44, \ + 0x80, 0xc5, 0x1a, 0xb9, 0x50, 0x2f, 0x3b, 0xfc) #define EFI_EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE \ - EFI_GUID(0x13fa7698, 0xc831, 0x49c7, 0x87, 0xea, \ - 0x8f, 0x43, 0xfc, 0xc2, 0x51, 0x96) + EFI_GUID(0x13fa7698, 0xc831, 0x49c7, \ + 0x87, 0xea, 0x8f, 0x43, 0xfc, 0xc2, 0x51, 0x96) #define EFI_EVENT_GROUP_MEMORY_MAP_CHANGE \ - EFI_GUID(0x78bee926, 0x692f, 0x48fd, 0x9e, 0xdb, \ - 0x01, 0x42, 0x2e, 0xf0, 0xd7, 0xab) + EFI_GUID(0x78bee926, 0x692f, 0x48fd, \ + 0x9e, 0xdb, 0x01, 0x42, 0x2e, 0xf0, 0xd7, 0xab) #define EFI_EVENT_GROUP_READY_TO_BOOT \ - EFI_GUID(0x7ce88fb3, 0x4bd7, 0x4679, 0x87, 0xa8, \ - 0xa8, 0xd8, 0xde, 0xe5, 0x0d, 0x2b) + EFI_GUID(0x7ce88fb3, 0x4bd7, 0x4679, \ + 0x87, 0xa8, 0xa8, 0xd8, 0xde, 0xe5, 0x0d, 0x2b) #define EFI_EVENT_GROUP_AFTER_READY_TO_BOOT \ - EFI_GUID(0x3a2a00ad, 0x98b9, 0x4cdf, 0xa4, 0x78, \ - 0x70, 0x27, 0x77, 0xf1, 0xc1, 0xb) + EFI_GUID(0x3a2a00ad, 0x98b9, 0x4cdf, \ + 0xa4, 0x78, 0x70, 0x27, 0x77, 0xf1, 0xc1, 0xb) #define EFI_EVENT_GROUP_RESET_SYSTEM \ - EFI_GUID(0x62da6a56, 0x13fb, 0x485a, 0xa8, 0xda, \ - 0xa3, 0xdd, 0x79, 0x12, 0xcb, 0x6b) + EFI_GUID(0x62da6a56, 0x13fb, 0x485a, \ + 0xa8, 0xda, 0xa3, 0xdd, 0x79, 0x12, 0xcb, 0x6b) #define EFI_EVENT_GROUP_RETURN_TO_EFIBOOTMGR \ - EFI_GUID(0xb4a40fe6, 0x9149, 0x4f29, 0x94, 0x47, \ - 0x49, 0x38, 0x7a, 0x7f, 0xab, 0x87) + EFI_GUID(0xb4a40fe6, 0x9149, 0x4f29, \ + 0x94, 0x47, 0x49, 0x38, 0x7a, 0x7f, 0xab, 0x87) /* EFI Configuration Table and GUID definitions */ #define NULL_GUID \ - EFI_GUID(0x00000000, 0x0000, 0x0000, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00) + EFI_GUID(0x00000000, 0x0000, 0x0000, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00) #define EFI_GLOBAL_VARIABLE_GUID \ - EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, 0xaa, 0x0d, \ - 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c) + EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, \ + 0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c) #define EFI_IMAGE_SECURITY_DATABASE_GUID \ - EFI_GUID(0xd719b2cb, 0x3d3a, 0x4596, 0xa3, 0xbc, \ - 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f) + EFI_GUID(0xd719b2cb, 0x3d3a, 0x4596, \ + 0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f) #define EFI_FDT_GUID \ EFI_GUID(0xb1b621d5, 0xf19c, 0x41a5, \ @@ -432,7 +432,7 @@ struct efi_runtime_services { 0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81) #define SMBIOS_TABLE_GUID \ - EFI_GUID(0xeb9d2d31, 0x2d88, 0x11d3, \ + EFI_GUID(0xeb9d2d31, 0x2d88, 0x11d3, \ 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) #define SMBIOS3_TABLE_GUID \ @@ -448,24 +448,24 @@ struct efi_runtime_services { 0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d) #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID \ - EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, 0xbd, \ - 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25) + EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, \ + 0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25) #define EFI_RNG_PROTOCOL_GUID \ - EFI_GUID(0x3152bca5, 0xeade, 0x433d, 0x86, 0x2e, \ - 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44) + EFI_GUID(0x3152bca5, 0xeade, 0x433d, \ + 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44) #define EFI_DT_FIXUP_PROTOCOL_GUID \ - EFI_GUID(0xe617d64c, 0xfe08, 0x46da, 0xf4, 0xdc, \ - 0xbb, 0xd5, 0x87, 0x0c, 0x73, 0x00) + EFI_GUID(0xe617d64c, 0xfe08, 0x46da, \ + 0xf4, 0xdc, 0xbb, 0xd5, 0x87, 0x0c, 0x73, 0x00) #define EFI_TCG2_PROTOCOL_GUID \ - EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, \ - 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f) + EFI_GUID(0x607f766c, 0x7455, 0x42be, \ + 0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f) #define RISCV_EFI_BOOT_PROTOCOL_GUID \ - EFI_GUID(0xccd15fec, 0x6f73, 0x4eec, 0x83, \ - 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf) + EFI_GUID(0xccd15fec, 0x6f73, 0x4eec, \ + 0x83, 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf) /** * struct efi_configuration_table - EFI Configuration Table @@ -2166,57 +2166,57 @@ struct efi_system_resource_table { /* Certificate types in signature database */ #define EFI_CERT_SHA1_GUID \ - EFI_GUID(0x826ca512, 0xcf10, 0x4ac9, 0xb1, 0x87, \ - 0xbe, 0x01, 0x49, 0x66, 0x31, 0xbd) + EFI_GUID(0x826ca512, 0xcf10, 0x4ac9, \ + 0xb1, 0x87, 0xbe, 0x01, 0x49, 0x66, 0x31, 0xbd) #define EFI_CERT_SHA224_GUID \ - EFI_GUID(0xb6e5233, 0xa65c, 0x44c9, 0x94, 0x07, \ - 0xd9, 0xab, 0x83, 0xbf, 0xc8, 0xbd) + EFI_GUID(0xb6e5233, 0xa65c, 0x44c9, \ + 0x94, 0x07, 0xd9, 0xab, 0x83, 0xbf, 0xc8, 0xbd) #define EFI_CERT_SHA256_GUID \ - EFI_GUID(0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, \ - 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28) + EFI_GUID(0xc1c41626, 0x504c, 0x4092, \ + 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28) #define EFI_CERT_SHA384_GUID \ - EFI_GUID(0xff3e5307, 0x9fd0, 0x48c9, 0x85, 0xf1, \ - 0x8a, 0xd5, 0x6c, 0x70, 0x1e, 0x01) + EFI_GUID(0xff3e5307, 0x9fd0, 0x48c9, \ + 0x85, 0xf1, 0x8a, 0xd5, 0x6c, 0x70, 0x1e, 0x01) #define EFI_CERT_SHA512_GUID \ - EFI_GUID(0x93e0fae, 0xa6c4, 0x4f50, 0x9f, 0x1b, \ - 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a) + EFI_GUID(0x93e0fae, 0xa6c4, 0x4f50, \ + 0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a) #define EFI_CERT_RSA2048_GUID \ - EFI_GUID(0x3c5766e8, 0x269c, 0x4e34, 0xaa, 0x14, \ - 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6) + EFI_GUID(0x3c5766e8, 0x269c, 0x4e34, \ + 0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6) #define EFI_CERT_X509_GUID \ - EFI_GUID(0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, \ - 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72) + EFI_GUID(0xa5c059a1, 0x94e4, 0x4aa7, \ + 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72) #define EFI_CERT_X509_SHA256_GUID \ - EFI_GUID(0x3bd2a492, 0x96c0, 0x4079, 0xb4, 0x20, \ - 0xfc, 0xf9, 0x8e, 0xf1, 0x03, 0xed) + EFI_GUID(0x3bd2a492, 0x96c0, 0x4079, \ + 0xb4, 0x20, 0xfc, 0xf9, 0x8e, 0xf1, 0x03, 0xed) #define EFI_CERT_X509_SHA384_GUID \ - EFI_GUID(0x7076876e, 0x80c2, 0x4ee6, \ + EFI_GUID(0x7076876e, 0x80c2, 0x4ee6, \ 0xaa, 0xd2, 0x28, 0xb3, 0x49, 0xa6, 0x86, 0x5b) #define EFI_CERT_X509_SHA512_GUID \ - EFI_GUID(0x446dbf63, 0x2502, 0x4cda, \ + EFI_GUID(0x446dbf63, 0x2502, 0x4cda, \ 0xbc, 0xfa, 0x24, 0x65, 0xd2, 0xb0, 0xfe, 0x9d) #define EFI_CERT_TYPE_PKCS7_GUID \ - EFI_GUID(0x4aafd29d, 0x68df, 0x49ee, 0x8a, 0xa9, \ - 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7) + EFI_GUID(0x4aafd29d, 0x68df, 0x49ee, \ + 0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7) #define EFI_LZMA_COMPRESSED \ - EFI_GUID(0xee4e5898, 0x3914, 0x4259, 0x9d, 0x6e, \ - 0xdc, 0x7b, 0xd7, 0x94, 0x03, 0xcf) + EFI_GUID(0xee4e5898, 0x3914, 0x4259, \ + 0x9d, 0x6e, 0xdc, 0x7b, 0xd7, 0x94, 0x03, 0xcf) #define EFI_DXE_SERVICES \ - EFI_GUID(0x05ad34ba, 0x6f02, 0x4214, 0x95, 0x2e, \ - 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9) + EFI_GUID(0x05ad34ba, 0x6f02, 0x4214, \ + 0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9) #define EFI_HOB_LIST \ - EFI_GUID(0x7739f24c, 0x93d7, 0x11d4, 0x9a, 0x3a, \ - 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) + EFI_GUID(0x7739f24c, 0x93d7, 0x11d4, \ + 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) #define EFI_MEMORY_TYPE \ - EFI_GUID(0x4c19049f, 0x4137, 0x4dd3, 0x9c, 0x10, \ - 0x8b, 0x97, 0xa8, 0x3f, 0xfd, 0xfa) + EFI_GUID(0x4c19049f, 0x4137, 0x4dd3, \ + 0x9c, 0x10, 0x8b, 0x97, 0xa8, 0x3f, 0xfd, 0xfa) #define EFI_MEM_STATUS_CODE_REC \ - EFI_GUID(0x060cc026, 0x4c0d, 0x4dda, 0x8f, 0x41, \ - 0x59, 0x5f, 0xef, 0x00, 0xa5, 0x02) + EFI_GUID(0x060cc026, 0x4c0d, 0x4dda, \ + 0x8f, 0x41, 0x59, 0x5f, 0xef, 0x00, 0xa5, 0x02) #define EFI_GUID_EFI_ACPI1 \ - EFI_GUID(0xeb9d2d30, 0x2d88, 0x11d3, 0x9a, 0x16, \ - 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) + EFI_GUID(0xeb9d2d30, 0x2d88, 0x11d3, \ + 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) /** * struct win_certificate_uefi_guid - A certificate that encapsulates @@ -2304,8 +2304,8 @@ struct efi_signature_list { * Firmware management protocol */ #define EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GUID \ - EFI_GUID(0x86c77a67, 0x0b97, 0x4633, 0xa1, 0x87, \ - 0x49, 0x10, 0x4d, 0x06, 0x85, 0xc7) + EFI_GUID(0x86c77a67, 0x0b97, 0x4633, \ + 0xa1, 0x87, 0x49, 0x10, 0x4d, 0x06, 0x85, 0xc7) #define IMAGE_ATTRIBUTE_IMAGE_UPDATABLE 0x0000000000000001 #define IMAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 @@ -2396,8 +2396,8 @@ struct efi_firmware_management_protocol { }; #define EFI_DISK_IO_PROTOCOL_GUID \ - EFI_GUID(0xce345171, 0xba0b, 0x11d2, 0x8e, 0x4f, \ - 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) + EFI_GUID(0xce345171, 0xba0b, 0x11d2, \ + 0x8e, 0x4f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) struct efi_disk { u64 revision; -- 2.43.0