Removed tabs and fixed some minor coding style issues. Also fixed typo in EFI_PEI_ENT...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2668 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Pi/PiBootMode.h b/MdePkg/Include/Pi/PiBootMode.h
index f7d988df1da8c2ca8a9914605ae10a3029c07e9d..8e244cbf87b33fd2f2a8d5fd83e998dc9204c9ec 100644 (file)
--- a/MdePkg/Include/Pi/PiBootMode.h
+++ b/MdePkg/Include/Pi/PiBootMode.h
@@ -20,21 +20,21 @@
 #ifndef __PI_BOOT_MODE_H__\r
 #define __PI_BOOT_MODE_H__\r
 \r
 #ifndef __PI_BOOT_MODE_H__\r
 #define __PI_BOOT_MODE_H__\r
 \r

-typedef UINT32         EFI_BOOT_MODE;\r
+typedef UINT32  EFI_BOOT_MODE;\r

 \r
 //\r
 // 0x21 - 0xf..f are reserved.\r
 // \r
 \r
 //\r
 // 0x21 - 0xf..f are reserved.\r
 // \r

-#define BOOT_WITH_FULL_CONFIGURATION                                                                   0x00\r
-#define BOOT_WITH_MINIMAL_CONFIGURATION                                                        0x01\r
-#define BOOT_ASSUMING_NO_CONFIGURATION_CHANGES                                 0x02\r
+#define BOOT_WITH_FULL_CONFIGURATION                  0x00\r
+#define BOOT_WITH_MINIMAL_CONFIGURATION               0x01\r
+#define BOOT_ASSUMING_NO_CONFIGURATION_CHANGES        0x02\r

 #define BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS 0x03\r
 #define BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS 0x03\r

-#define BOOT_WITH_DEFAULT_SETTINGS                                                                             0x04\r
-#define BOOT_ON_S4_RESUME                                                                                                              0x05\r
-#define BOOT_ON_S5_RESUME                                                                                                              0x06\r
-#define BOOT_ON_S2_RESUME                                                                                                              0x10\r
-#define BOOT_ON_S3_RESUME                                                                                                              0x11\r
-#define BOOT_ON_FLASH_UPDATE                                                                                                   0x12\r
-#define BOOT_IN_RECOVERY_MODE                                                                                                  0x20\r
+#define BOOT_WITH_DEFAULT_SETTINGS                    0x04\r
+#define BOOT_ON_S4_RESUME                             0x05\r
+#define BOOT_ON_S5_RESUME                             0x06\r
+#define BOOT_ON_S2_RESUME                             0x10\r
+#define BOOT_ON_S3_RESUME                             0x11\r
+#define BOOT_ON_FLASH_UPDATE                          0x12\r
+#define BOOT_IN_RECOVERY_MODE                         0x20\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 2001f1f7c0a194a13fb909c30d9e934968b4e917..3301eedc8fed0b2535999c95a86f4de00bb35202 100644 (file)
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -190,7 +190,6 @@ EFI_STATUS
 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

-\r

 EFI_STATUS\r
 (EFIAPI *EFI_SET_MEMORY_SPACE_ATTRIBUTES) (\r
   IN EFI_PHYSICAL_ADDRESS         BaseAddress,\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_MEMORY_SPACE_ATTRIBUTES) (\r
   IN EFI_PHYSICAL_ADDRESS         BaseAddress,\r


@@ -351,7 +350,9 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_DISPATCH) (VOID)\r
+(EFIAPI *EFI_DISPATCH) (\r
+  VOID\r
+  )\r

 ;\r
 \r
 /**\r
 ;\r
 \r
 /**\r


@@ -410,8 +411,8 @@ EFI_STATUS
 //\r
 // DXE Services Table\r
 //\r
 //\r
 // DXE Services Table\r
 //\r

-#define DXE_SERVICES_SIGNATURE         0x565245535f455844\r
-#define DXE_SERVICES_REVISION  ((1<<16) | (00)\r
+#define DXE_SERVICES_SIGNATURE  0x565245535f455844\r
+#define DXE_SERVICES_REVISION   ((1<<16) | (00)\r

 \r
 typedef struct {\r
   EFI_TABLE_HEADER                Hdr;\r
 \r
 typedef struct {\r
   EFI_TABLE_HEADER                Hdr;\r

diff --git a/MdePkg/Include/Pi/PiFirmwareFile.h b/MdePkg/Include/Pi/PiFirmwareFile.h
index db4167263bc10f8e388ca5ab768aa4e06562e0b1..94fed610ac129975a37f76686cab73fe5e7e4c05 100644 (file)
--- a/MdePkg/Include/Pi/PiFirmwareFile.h
+++ b/MdePkg/Include/Pi/PiFirmwareFile.h
@@ -119,9 +119,9 @@ typedef EFI_COMMON_SECTION_HEADER EFI_COMPATIBILITY16_SECTION;
 // section data is compressed.\r
 // \r
 typedef struct {\r
 // section data is compressed.\r
 // \r
 typedef struct {\r

-  EFI_COMMON_SECTION_HEADER CommonHeader;\r
-  UINT32  UncompressedLength;\r
-  UINT8   CompressionType;\r
+  EFI_COMMON_SECTION_HEADER   CommonHeader;\r
+  UINT32                      UncompressedLength;\r
+  UINT8                       CompressionType;\r

 } EFI_COMPRESSION_SECTION;\r
 \r
 //\r
 } EFI_COMPRESSION_SECTION;\r
 \r
 //\r


@@ -138,8 +138,8 @@ typedef EFI_COMMON_SECTION_HEADER EFI_FIRMWARE_VOLUME_IMAGE_SECTION;
 // Leaf section which contains a single GUID.\r
 // \r
 typedef struct {\r
 // Leaf section which contains a single GUID.\r
 // \r
 typedef struct {\r

-  EFI_COMMON_SECTION_HEADER CommonHeader;\r
-  EFI_GUID  SubTypeGuid;\r
+  EFI_COMMON_SECTION_HEADER   CommonHeader;\r
+  EFI_GUID                    SubTypeGuid;\r

 } EFI_FREEFORM_SUBTYPE_GUID_SECTION;\r
 \r
 //\r
 } EFI_FREEFORM_SUBTYPE_GUID_SECTION;\r
 \r
 //\r


@@ -151,10 +151,10 @@ typedef struct {
 // Leaf section which is encapsulation defined by specific GUID\r
 // \r
 typedef struct {\r
 // Leaf section which is encapsulation defined by specific GUID\r
 // \r
 typedef struct {\r

-  EFI_COMMON_SECTION_HEADER CommonHeader;\r
-  EFI_GUID  SectionDefinitionGuid;\r
-  UINT16    DataOffset;\r
-  UINT16    Attributes;\r
+  EFI_COMMON_SECTION_HEADER   CommonHeader;\r
+  EFI_GUID                    SectionDefinitionGuid;\r
+  UINT16                      DataOffset;\r
+  UINT16                      Attributes;\r

 } EFI_GUID_DEFINED_SECTION;\r
 \r
 //\r
 } EFI_GUID_DEFINED_SECTION;\r
 \r
 //\r


@@ -183,12 +183,12 @@ typedef EFI_COMMON_SECTION_HEADER EFI_RAW_SECTION;
 // is human readable file name.\r
 // \r
 typedef struct {\r
 // is human readable file name.\r
 // \r
 typedef struct {\r

-  EFI_COMMON_SECTION_HEADER CommonHeader;\r
+  EFI_COMMON_SECTION_HEADER   CommonHeader;\r

 \r
   //\r
   // Array of unicode string.\r
   // \r
 \r
   //\r
   // Array of unicode string.\r
   // \r

-  CHAR16 FileNameString[1];\r
+  CHAR16                      FileNameString[1];\r

 } EFI_USER_INTERFACE_SECTION;\r
 \r
 \r
 } EFI_USER_INTERFACE_SECTION;\r
 \r
 \r


@@ -197,9 +197,9 @@ typedef struct {
 // an optional unicode string that represent the file revision. \r
 // \r
 typedef struct {\r
 // an optional unicode string that represent the file revision. \r
 // \r
 typedef struct {\r

-  EFI_COMMON_SECTION_HEADER CommonHeader;\r
-  UINT16  BuildNumber;\r
-  CHAR16  VersionString[1];\r
+  EFI_COMMON_SECTION_HEADER   CommonHeader;\r
+  UINT16                      BuildNumber;\r
+  CHAR16                      VersionString[1];\r

 } EFI_VERSION_SECTION;\r
 \r
 #endif\r
 } EFI_VERSION_SECTION;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index 38f57f7d78641743afab4d10a0b615f015952b31..9f558168cddac5a82af82a8e9ebeed2634efa5bb 100644 (file)
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -23,16 +23,16 @@
 //\r
 // EFI_FV_FILE_ATTRIBUTES\r
 //\r
 //\r
 // EFI_FV_FILE_ATTRIBUTES\r
 //\r

-typedef UINT32         EFI_FV_FILE_ATTRIBUTES;\r
+typedef UINT32  EFI_FV_FILE_ATTRIBUTES;\r

 \r
 //\r
 // Value of EFI_FV_FILE_ATTRIBUTES.\r
 // \r
 \r
 //\r
 // Value of EFI_FV_FILE_ATTRIBUTES.\r
 // \r

-#define EFI_FV_FILE_ATTRIB_ALIGNMENT                   0x0000001F\r
-#define EFI_FV_FILE_ATTRIB_FIXED                                       0x00000100\r
-#define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED       0x00000200\r
+#define EFI_FV_FILE_ATTRIB_ALIGNMENT      0x0000001F\r
+#define EFI_FV_FILE_ATTRIB_FIXED          0x00000100\r
+#define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED  0x00000200\r

 \r
 \r

-typedef UINT32         EFI_FVB_ATTRIBUTES;\r
+typedef UINT32  EFI_FVB_ATTRIBUTES;\r

 \r
 // \r
 // Attributes bit definitions\r
 \r
 // \r
 // Attributes bit definitions\r


@@ -96,16 +96,16 @@ typedef struct {
 // Describes the features and layout of the firmware volume.\r
 //\r
 typedef struct {\r
 // Describes the features and layout of the firmware volume.\r
 //\r
 typedef struct {\r

-  UINT8     ZeroVector[16];\r
-  EFI_GUID  FileSystemGuid;\r
-  UINT64    FvLength;\r
-  UINT32    Signature;\r
-  EFI_FVB_ATTRIBUTES  Attributes;\r
-  UINT16    HeaderLength;\r
-  UINT16    Checksum;\r
-  UINT16    ExtHeaderOffset;\r
-  UINT8     Reserved[1];\r
-  UINT8     Revision;\r
+  UINT8                     ZeroVector[16];\r
+  EFI_GUID                  FileSystemGuid;\r
+  UINT64                    FvLength;\r
+  UINT32                    Signature;\r
+  EFI_FVB_ATTRIBUTES        Attributes;\r
+  UINT16                    HeaderLength;\r
+  UINT16                    Checksum;\r
+  UINT16                    ExtHeaderOffset;\r
+  UINT8                     Reserved[1];\r
+  UINT8                     Revision;\r

   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];\r
 } EFI_FIRMWARE_VOLUME_HEADER;\r
 \r
   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];\r
 } EFI_FIRMWARE_VOLUME_HEADER;\r
 \r

diff --git a/MdePkg/Include/Pi/PiHob.h b/MdePkg/Include/Pi/PiHob.h
index 7a710a44a4d116bcdb4cb1a83676134244b020af..85213ea1e436be70d765d9a7df6a7796eaa8683d 100644 (file)
--- a/MdePkg/Include/Pi/PiHob.h
+++ b/MdePkg/Include/Pi/PiHob.h
@@ -1,19 +1,19 @@
 /* @file\r
 /* @file\r

-       HOB related definitions in PI.\r
+  HOB related definitions in PI.\r

 \r
 \r

-       Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
-       All rights reserved. This program and the accompanying materials                          \r
-       are licensed and made available under the terms and conditions of the BSD License         \r
-       which accompanies this distribution.  The full text of the license may be found at        \r
-       http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
+  All rights reserved. This program and the accompanying materials                          \r
+  are licensed and made available under the terms and conditions of the BSD License         \r
+  which accompanies this distribution.  The full text of the license may be found at        \r
+  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r

 \r
 \r

-       Module Name:  PiHob.h\r
+  Module Name:  PiHob.h\r

 \r
 \r

-       @par Revision Reference:\r
-       Version 1.0.\r
+  @par Revision Reference:\r
+  Version 1.0.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -23,26 +23,26 @@
 //\r
 // HobType of EFI_HOB_GENERIC_HEADER.\r
 // \r
 //\r
 // HobType of EFI_HOB_GENERIC_HEADER.\r
 // \r

-#define EFI_HOB_TYPE_HANDOFF                                                   0x0001\r
-#define EFI_HOB_TYPE_MEMORY_ALLOCATION                 0x0002\r
-#define EFI_HOB_TYPE_RESOURCE_DESCRIPTOR       0x0003\r
-#define EFI_HOB_TYPE_GUID_EXTENSION                    0x0004\r
-#define EFI_HOB_TYPE_FV                                                                        0x0005\r
-#define EFI_HOB_TYPE_CPU                                                                       0x0006\r
-#define EFI_HOB_TYPE_MEMORY_POOL                                       0x0007\r
-#define EFI_HOB_TYPE_FV2                                                                       0x0009\r
-#define EFI_HOB_TYPE_LOAD_PEIM                                                 0x000A\r
-#define EFI_HOB_TYPE_UNUSED                                                    0xFFFE\r
-#define EFI_HOB_TYPE_END_OF_HOB_LIST                   0xFFFF\r
+#define EFI_HOB_TYPE_HANDOFF              0x0001\r
+#define EFI_HOB_TYPE_MEMORY_ALLOCATION    0x0002\r
+#define EFI_HOB_TYPE_RESOURCE_DESCRIPTOR  0x0003\r
+#define EFI_HOB_TYPE_GUID_EXTENSION       0x0004\r
+#define EFI_HOB_TYPE_FV                   0x0005\r
+#define EFI_HOB_TYPE_CPU                  0x0006\r
+#define EFI_HOB_TYPE_MEMORY_POOL          0x0007\r
+#define EFI_HOB_TYPE_FV2                  0x0009\r
+#define EFI_HOB_TYPE_LOAD_PEIM            0x000A\r
+#define EFI_HOB_TYPE_UNUSED               0xFFFE\r
+#define EFI_HOB_TYPE_END_OF_HOB_LIST      0xFFFF\r

 \r
 //\r
 // Describes the format and size of the data inside the HOB. \r
 // All HOBs must contain this generic HOB header.\r
 // \r
 \r
 //\r
 // Describes the format and size of the data inside the HOB. \r
 // All HOBs must contain this generic HOB header.\r
 // \r

-typedef struct _EFI_HOB_GENERIC_HEADER {\r
-       UINT16 HobType;\r
-       UINT16 HobLength;\r
-       UINT32 Reserved;\r
+typedef struct {\r
+  UINT16    HobType;\r
+  UINT16    HobLength;\r
+  UINT32    Reserved;\r

 } EFI_HOB_GENERIC_HEADER;\r
 \r
 \r
 } EFI_HOB_GENERIC_HEADER;\r
 \r
 \r


@@ -54,28 +54,28 @@ typedef struct _EFI_HOB_GENERIC_HEADER {
 // Contains general state information used by the HOB producer phase. \r
 // This HOB must be the first one in the HOB list.\r
 // \r
 // Contains general state information used by the HOB producer phase. \r
 // This HOB must be the first one in the HOB list.\r
 // \r

-typedef struct _EFI_HOB_HANDOFF_INFO_TABLE {\r
-       EFI_HOB_GENERIC_HEADER  Header;\r
-       UINT32                Version;\r
-       EFI_BOOT_MODE         BootMode;\r
-       EFI_PHYSICAL_ADDRESS  EfiMemoryTop;\r
-       EFI_PHYSICAL_ADDRESS  EfiMemoryBottom;\r
-       EFI_PHYSICAL_ADDRESS  EfiFreeMemoryTop;\r
-       EFI_PHYSICAL_ADDRESS  EfiFreeMemoryBottom;\r
-       EFI_PHYSICAL_ADDRESS  EfiEndOfHobList;\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER  Header;\r
+  UINT32                  Version;\r
+  EFI_BOOT_MODE           BootMode;\r
+  EFI_PHYSICAL_ADDRESS    EfiMemoryTop;\r
+  EFI_PHYSICAL_ADDRESS    EfiMemoryBottom;\r
+  EFI_PHYSICAL_ADDRESS    EfiFreeMemoryTop;\r
+  EFI_PHYSICAL_ADDRESS    EfiFreeMemoryBottom;\r
+  EFI_PHYSICAL_ADDRESS    EfiEndOfHobList;\r

 } EFI_HOB_HANDOFF_INFO_TABLE;\r
 \r
 \r
 } EFI_HOB_HANDOFF_INFO_TABLE;\r
 \r
 \r

-typedef struct _EFI_HOB_MEMORY_ALLOCATION_HEADER {\r
-       EFI_GUID              Name;\r
-       EFI_PHYSICAL_ADDRESS  MemoryBaseAddress;\r
-       UINT64                MemoryLength;\r
-       EFI_MEMORY_TYPE       MemoryType;\r
-\r
-       //\r
-       // Padding for Itanium processor family\r
-       // \r
-       UINT8                 Reserved[4];\r
+typedef struct {\r
+  EFI_GUID              Name;\r
+  EFI_PHYSICAL_ADDRESS  MemoryBaseAddress;\r
+  UINT64                MemoryLength;\r
+  EFI_MEMORY_TYPE       MemoryType;\r
+\r
+  //\r
+  // Padding for Itanium processor family\r
+  // \r
+  UINT8                 Reserved[4];\r

 } EFI_HOB_MEMORY_ALLOCATION_HEADER;\r
 \r
 //\r
 } EFI_HOB_MEMORY_ALLOCATION_HEADER;\r
 \r
 //\r


@@ -84,13 +84,13 @@ typedef struct _EFI_HOB_MEMORY_ALLOCATION_HEADER {
 // describes how memory is used, \r
 // not the physical attributes of memory.\r
 // \r
 // describes how memory is used, \r
 // not the physical attributes of memory.\r
 // \r

-typedef struct _EFI_HOB_MEMORY_ALLOCATION {\r
-       EFI_HOB_GENERIC_HEADER            Header;\r
-       EFI_HOB_MEMORY_ALLOCATION_HEADER  AllocDescriptor;\r
-       //\r
-       // Additional data pertaining to the ¡°Name¡± Guid memory\r
-       // may go here.\r
-       //\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER            Header;\r
+  EFI_HOB_MEMORY_ALLOCATION_HEADER  AllocDescriptor;\r
+  //\r
+  // Additional data pertaining to the ¡°Name¡± Guid memory\r
+  // may go here.\r
+  //\r

 } EFI_HOB_MEMORY_ALLOCATION;\r
 \r
 \r
 } EFI_HOB_MEMORY_ALLOCATION;\r
 \r
 \r


@@ -99,9 +99,9 @@ typedef struct _EFI_HOB_MEMORY_ALLOCATION {
 // phase and upon which all postmemory-installed executable\r
 // content in the HOB producer phase is executing.\r
 // \r
 // phase and upon which all postmemory-installed executable\r
 // content in the HOB producer phase is executing.\r
 // \r

-typedef struct _EFI_HOB_MEMORY_ALLOCATION_STACK {\r
-       EFI_HOB_GENERIC_HEADER            Header;\r
-       EFI_HOB_MEMORY_ALLOCATION_HEADER  AllocDescriptor;\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER            Header;\r
+  EFI_HOB_MEMORY_ALLOCATION_HEADER  AllocDescriptor;\r

 } EFI_HOB_MEMORY_ALLOCATION_STACK;\r
 \r
 //\r
 } EFI_HOB_MEMORY_ALLOCATION_STACK;\r
 \r
 //\r


@@ -110,19 +110,19 @@ typedef struct _EFI_HOB_MEMORY_ALLOCATION_STACK {
 // This HOB is valid for the Itanium processor family only \r
 // register overflow store.\r
 // \r
 // This HOB is valid for the Itanium processor family only \r
 // register overflow store.\r
 // \r

-typedef struct _EFI_HOB_MEMORY_ALLOCATION_BSP_STORE {\r
-       EFI_HOB_GENERIC_HEADER            Header;\r
-       EFI_HOB_MEMORY_ALLOCATION_HEADER  AllocDescriptor;\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER            Header;\r
+  EFI_HOB_MEMORY_ALLOCATION_HEADER  AllocDescriptor;\r

 } EFI_HOB_MEMORY_ALLOCATION_BSP_STORE;\r
 \r
 //\r
 // Defines the location and entry point of the HOB consumer phase.\r
 // \r
 typedef struct {\r
 } EFI_HOB_MEMORY_ALLOCATION_BSP_STORE;\r
 \r
 //\r
 // Defines the location and entry point of the HOB consumer phase.\r
 // \r
 typedef struct {\r

-       EFI_HOB_GENERIC_HEADER            Header;\r
-       EFI_HOB_MEMORY_ALLOCATION_HEADER  MemoryAllocationHeader;\r
-       EFI_GUID ModuleName;\r
-       EFI_PHYSICAL_ADDRESS EntryPoint;\r
+  EFI_HOB_GENERIC_HEADER            Header;\r
+  EFI_HOB_MEMORY_ALLOCATION_HEADER  MemoryAllocationHeader;\r
+  EFI_GUID ModuleName;\r
+  EFI_PHYSICAL_ADDRESS EntryPoint;\r

 } EFI_HOB_MEMORY_ALLOCATION_MODULE;\r
 \r
 typedef UINT32 EFI_RESOURCE_TYPE;\r
 } EFI_HOB_MEMORY_ALLOCATION_MODULE;\r
 \r
 typedef UINT32 EFI_RESOURCE_TYPE;\r


@@ -130,14 +130,14 @@ typedef UINT32 EFI_RESOURCE_TYPE;
 //\r
 // Value of ResourceType in EFI_HOB_RESOURCE_DESCRIPTOR.\r
 // \r
 //\r
 // Value of ResourceType in EFI_HOB_RESOURCE_DESCRIPTOR.\r
 // \r

-#define EFI_RESOURCE_SYSTEM_MEMORY                                     0x00000000\r
-#define EFI_RESOURCE_MEMORY_MAPPED_IO                  0x00000001\r
-#define EFI_RESOURCE_IO                                                                                0x00000002\r
-#define EFI_RESOURCE_FIRMWARE_DEVICE                           0x00000003\r
-#define EFI_RESOURCE_MEMORY_MAPPED_IO_PORT     0x00000004\r
-#define EFI_RESOURCE_MEMORY_RESERVED                           0x00000005\r
-#define EFI_RESOURCE_IO_RESERVED                                               0x00000006\r
-#define EFI_RESOURCE_MAX_MEMORY_TYPE                           0x00000007\r
+#define EFI_RESOURCE_SYSTEM_MEMORY          0x00000000\r
+#define EFI_RESOURCE_MEMORY_MAPPED_IO       0x00000001\r
+#define EFI_RESOURCE_IO                     0x00000002\r
+#define EFI_RESOURCE_FIRMWARE_DEVICE        0x00000003\r
+#define EFI_RESOURCE_MEMORY_MAPPED_IO_PORT  0x00000004\r
+#define EFI_RESOURCE_MEMORY_RESERVED        0x00000005\r
+#define EFI_RESOURCE_IO_RESERVED            0x00000006\r
+#define EFI_RESOURCE_MAX_MEMORY_TYPE        0x00000007\r

 \r
 \r
 typedef UINT32 EFI_RESOURCE_ATTRIBUTE_TYPE;\r
 \r
 \r
 typedef UINT32 EFI_RESOURCE_ATTRIBUTE_TYPE;\r


@@ -147,62 +147,62 @@ typedef UINT32 EFI_RESOURCE_ATTRIBUTE_TYPE;
 //\r
 // The first three enumerations describe settings\r
 //\r
 //\r
 // The first three enumerations describe settings\r
 //\r

-#define EFI_RESOURCE_ATTRIBUTE_PRESENT                                                         0x00000001\r
-#define EFI_RESOURCE_ATTRIBUTE_INITIALIZED                                     0x00000002\r
-#define EFI_RESOURCE_ATTRIBUTE_TESTED                                                  0x00000004\r
+#define EFI_RESOURCE_ATTRIBUTE_PRESENT              0x00000001\r
+#define EFI_RESOURCE_ATTRIBUTE_INITIALIZED          0x00000002\r
+#define EFI_RESOURCE_ATTRIBUTE_TESTED               0x00000004\r

 //\r
 // The rest of the settings describe capabilities\r
 //\r
 //\r
 // The rest of the settings describe capabilities\r
 //\r

-#define EFI_RESOURCE_ATTRIBUTE_SINGLE_BIT_ECC                  0x00000008\r
-#define EFI_RESOURCE_ATTRIBUTE_MULTIPLE_BIT_ECC                0x00000010\r
-#define EFI_RESOURCE_ATTRIBUTE_ECC_RESERVED_1                  0x00000020\r
-#define EFI_RESOURCE_ATTRIBUTE_ECC_RESERVED_2                  0x00000040\r
-#define EFI_RESOURCE_ATTRIBUTE_READ_PROTECTED                  0x00000080\r
-#define EFI_RESOURCE_ATTRIBUTE_WRITE_PROTECTED                         0x00000100\r
-#define EFI_RESOURCE_ATTRIBUTE_EXECUTION_PROTECTED     0x00000200\r
-#define EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE                                     0x00000400\r
-#define EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE               0x00000800\r
-#define EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE 0x00001000\r
+#define EFI_RESOURCE_ATTRIBUTE_SINGLE_BIT_ECC       0x00000008\r
+#define EFI_RESOURCE_ATTRIBUTE_MULTIPLE_BIT_ECC     0x00000010\r
+#define EFI_RESOURCE_ATTRIBUTE_ECC_RESERVED_1       0x00000020\r
+#define EFI_RESOURCE_ATTRIBUTE_ECC_RESERVED_2       0x00000040\r
+#define EFI_RESOURCE_ATTRIBUTE_READ_PROTECTED       0x00000080\r
+#define EFI_RESOURCE_ATTRIBUTE_WRITE_PROTECTED      0x00000100\r
+#define EFI_RESOURCE_ATTRIBUTE_EXECUTION_PROTECTED  0x00000200\r
+#define EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE          0x00000400\r
+#define EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE    0x00000800\r
+#define EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE  0x00001000\r

 #define EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE 0x00002000\r
 #define EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE 0x00002000\r

-#define EFI_RESOURCE_ATTRIBUTE_16_BIT_IO                                               0x00004000\r
-#define EFI_RESOURCE_ATTRIBUTE_32_BIT_IO                                               0x00008000\r
-#define EFI_RESOURCE_ATTRIBUTE_64_BIT_IO                                               0x00010000\r
-#define EFI_RESOURCE_ATTRIBUTE_UNCACHED_EXPORTED               0x00020000\r
+#define EFI_RESOURCE_ATTRIBUTE_16_BIT_IO            0x00004000\r
+#define EFI_RESOURCE_ATTRIBUTE_32_BIT_IO            0x00008000\r
+#define EFI_RESOURCE_ATTRIBUTE_64_BIT_IO            0x00010000\r
+#define EFI_RESOURCE_ATTRIBUTE_UNCACHED_EXPORTED    0x00020000\r

 \r
 //\r
 // Describes the resource properties of all fixed, \r
 // nonrelocatable resource ranges found on the processor\r
 // host bus during the HOB producer phase.\r
 // \r
 \r
 //\r
 // Describes the resource properties of all fixed, \r
 // nonrelocatable resource ranges found on the processor\r
 // host bus during the HOB producer phase.\r
 // \r

-typedef struct _EFI_HOB_RESOURCE_DESCRIPTOR {\r
-       EFI_HOB_GENERIC_HEADER      Header;\r
-       EFI_GUID                    Owner;\r
-       EFI_RESOURCE_TYPE           ResourceType;\r
-       EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute;\r
-       EFI_PHYSICAL_ADDRESS        PhysicalStart;\r
-       UINT64                      ResourceLength;\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER      Header;\r
+  EFI_GUID                    Owner;\r
+  EFI_RESOURCE_TYPE           ResourceType;\r
+  EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute;\r
+  EFI_PHYSICAL_ADDRESS        PhysicalStart;\r
+  UINT64                      ResourceLength;\r

 } EFI_HOB_RESOURCE_DESCRIPTOR;\r
 \r
 //\r
 // Allows writers of executable content in the HOB producer phase to \r
 // maintain and manage HOBs with specific GUID.\r
 // \r
 } EFI_HOB_RESOURCE_DESCRIPTOR;\r
 \r
 //\r
 // Allows writers of executable content in the HOB producer phase to \r
 // maintain and manage HOBs with specific GUID.\r
 // \r

-typedef struct _EFI_HOB_GUID_TYPE {\r
-       EFI_HOB_GENERIC_HEADER      Header;\r
-       EFI_GUID                    Name;\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER      Header;\r
+  EFI_GUID                    Name;\r

 \r
 \r

-       //\r
-       // Guid specific data goes here\r
-       //\r
+  //\r
+  // Guid specific data goes here\r
+  //\r

 } EFI_HOB_GUID_TYPE;\r
 \r
 //\r
 // Details the location of firmware volumes that contain firmware files.\r
 // \r
 typedef struct {\r
 } EFI_HOB_GUID_TYPE;\r
 \r
 //\r
 // Details the location of firmware volumes that contain firmware files.\r
 // \r
 typedef struct {\r

-       EFI_HOB_GENERIC_HEADER Header;\r
-       EFI_PHYSICAL_ADDRESS BaseAddress;\r
-       UINT64 Length;\r
+  EFI_HOB_GENERIC_HEADER Header;\r
+  EFI_PHYSICAL_ADDRESS BaseAddress;\r
+  UINT64 Length;\r

 } EFI_HOB_FIRMWARE_VOLUME;\r
 \r
 //\r
 } EFI_HOB_FIRMWARE_VOLUME;\r
 \r
 //\r


@@ -210,48 +210,48 @@ typedef struct {
 // from a file within another firmware volume.\r
 // \r
 typedef struct {\r
 // from a file within another firmware volume.\r
 // \r
 typedef struct {\r

-       EFI_HOB_GENERIC_HEADER  Header;\r
-       EFI_PHYSICAL_ADDRESS    BaseAddress;\r
-       UINT64                  Length;\r
-       EFI_GUID                FvName;\r
-       EFI_GUID                FileName;\r
+  EFI_HOB_GENERIC_HEADER  Header;\r
+  EFI_PHYSICAL_ADDRESS    BaseAddress;\r
+  UINT64                  Length;\r
+  EFI_GUID                FvName;\r
+  EFI_GUID                FileName;\r

 } EFI_HOB_FIRMWARE_VOLUME2;\r
 \r
 \r
 //\r
 // Describes processor information, such as address space and I/O space capabilities.\r
 // \r
 } EFI_HOB_FIRMWARE_VOLUME2;\r
 \r
 \r
 //\r
 // Describes processor information, such as address space and I/O space capabilities.\r
 // \r

-typedef struct _EFI_HOB_CPU {\r
-       EFI_HOB_GENERIC_HEADER  Header;\r
-       UINT8                                                                   SizeOfMemorySpace;\r
-       UINT8                                                                   SizeOfIoSpace;\r
-       UINT8                                                                   Reserved[6];\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER  Header;\r
+  UINT8                   SizeOfMemorySpace;\r
+  UINT8                   SizeOfIoSpace;\r
+  UINT8                   Reserved[6];\r

 } EFI_HOB_CPU;\r
 \r
 \r
 //\r
 // Describes pool memory allocations.\r
 // \r
 } EFI_HOB_CPU;\r
 \r
 \r
 //\r
 // Describes pool memory allocations.\r
 // \r

-typedef struct _EFI_HOB_MEMORY_POOL {\r
-       EFI_HOB_GENERIC_HEADER  Header;\r
+typedef struct {\r
+  EFI_HOB_GENERIC_HEADER  Header;\r

 } EFI_HOB_MEMORY_POOL;\r
 \r
 //\r
 // Union of all the possible HOB Types\r
 //\r
 typedef union {\r
 } EFI_HOB_MEMORY_POOL;\r
 \r
 //\r
 // Union of all the possible HOB Types\r
 //\r
 typedef union {\r

-       EFI_HOB_GENERIC_HEADER                                                  *Header;\r
-       EFI_HOB_HANDOFF_INFO_TABLE                                      *HandoffInformationTable;\r
-       EFI_HOB_MEMORY_ALLOCATION                                       *MemoryAllocation;\r
-       EFI_HOB_MEMORY_ALLOCATION_BSP_STORE *MemoryAllocationBspStore;\r
-       EFI_HOB_MEMORY_ALLOCATION_STACK                 *MemoryAllocationStack;\r
-       EFI_HOB_MEMORY_ALLOCATION_MODULE                *MemoryAllocationModule;\r
-       EFI_HOB_RESOURCE_DESCRIPTOR                             *ResourceDescriptor;\r
-       EFI_HOB_GUID_TYPE                                                                       *Guid;\r
-       EFI_HOB_FIRMWARE_VOLUME                                                 *FirmwareVolume;\r
-       EFI_HOB_CPU                                                                                             *Cpu;\r
-       EFI_HOB_MEMORY_POOL                                                             *Pool;\r
-       UINT8                                                                                                                   *Raw;\r
+  EFI_HOB_GENERIC_HEADER              *Header;\r
+  EFI_HOB_HANDOFF_INFO_TABLE          *HandoffInformationTable;\r
+  EFI_HOB_MEMORY_ALLOCATION           *MemoryAllocation;\r
+  EFI_HOB_MEMORY_ALLOCATION_BSP_STORE *MemoryAllocationBspStore;\r
+  EFI_HOB_MEMORY_ALLOCATION_STACK     *MemoryAllocationStack;\r
+  EFI_HOB_MEMORY_ALLOCATION_MODULE    *MemoryAllocationModule;\r
+  EFI_HOB_RESOURCE_DESCRIPTOR         *ResourceDescriptor;\r
+  EFI_HOB_GUID_TYPE                   *Guid;\r
+  EFI_HOB_FIRMWARE_VOLUME             *FirmwareVolume;\r
+  EFI_HOB_CPU                         *Cpu;\r
+  EFI_HOB_MEMORY_POOL                 *Pool;\r
+  UINT8                               *Raw;\r

 } EFI_PEI_HOB_POINTERS;\r
 \r
 \r
 } EFI_PEI_HOB_POINTERS;\r
 \r
 \r

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index 2b3f2482ec1dc5392f9ea8b2da164a13841b0df6..0f46168d6245dc5903f0ed17c8790d45aba16c01 100644 (file)
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -32,14 +32,14 @@
 //\r
 // Status Code Type Definition\r
 //\r
 //\r
 // Status Code Type Definition\r
 //\r

-typedef UINT32         EFI_STATUS_CODE_TYPE;\r
+typedef UINT32  EFI_STATUS_CODE_TYPE;\r

 \r
 //\r
 // A Status Code Type is made up of the code type and severity\r
 // All values masked by EFI_STATUS_CODE_RESERVED_MASK are\r
 // reserved for use by this specification.\r
 //\r
 \r
 //\r
 // A Status Code Type is made up of the code type and severity\r
 // All values masked by EFI_STATUS_CODE_RESERVED_MASK are\r
 // reserved for use by this specification.\r
 //\r

-#define EFI_STATUS_CODE_TYPE_MASK              0x000000FF\r
+#define EFI_STATUS_CODE_TYPE_MASK     0x000000FF\r

 #define EFI_STATUS_CODE_SEVERITY_MASK 0xFF000000\r
 #define EFI_STATUS_CODE_RESERVED_MASK 0x00FFFF00\r
 \r
 #define EFI_STATUS_CODE_SEVERITY_MASK 0xFF000000\r
 #define EFI_STATUS_CODE_RESERVED_MASK 0x00FFFF00\r
 \r


@@ -48,9 +48,9 @@ typedef UINT32        EFI_STATUS_CODE_TYPE;
 // EFI_STATUS_CODE_TYPE_MASK are reserved for use by\r
 // this specification.\r
 //\r
 // EFI_STATUS_CODE_TYPE_MASK are reserved for use by\r
 // this specification.\r
 //\r

-#define EFI_PROGRESS_CODE                                              0x00000001\r
-#define EFI_ERROR_CODE                                                                 0x00000002\r
-#define EFI_DEBUG_CODE                                                                 0x00000003\r
+#define EFI_PROGRESS_CODE             0x00000001\r
+#define EFI_ERROR_CODE                0x00000002\r
+#define EFI_DEBUG_CODE                0x00000003\r

 \r
 //\r
 // Definitions of severities, all other values masked by\r
 \r
 //\r
 // Definitions of severities, all other values masked by\r


@@ -61,10 +61,10 @@ typedef UINT32      EFI_STATUS_CODE_TYPE;
 // For example, if a memory error was not detected early enough,\r
 // the bad data could be consumed by other drivers.\r
 //\r
 // For example, if a memory error was not detected early enough,\r
 // the bad data could be consumed by other drivers.\r
 //\r

-#define EFI_ERROR_MINOR                                                        0x40000000\r
-#define EFI_ERROR_MAJOR                                                        0x80000000\r
-#define EFI_ERROR_UNRECOVERED                          0x90000000\r
-#define EFI_ERROR_UNCONTAINED                          0xa0000000\r
+#define EFI_ERROR_MINOR               0x40000000\r
+#define EFI_ERROR_MAJOR               0x80000000\r
+#define EFI_ERROR_UNRECOVERED         0x90000000\r
+#define EFI_ERROR_UNCONTAINED         0xa0000000\r

 \r
 //\r
 // Status Code Value Definition\r
 \r
 //\r
 // Status Code Value Definition\r


@@ -74,18 +74,18 @@ typedef UINT32 EFI_STATUS_CODE_VALUE;
 // A Status Code Value is made up of the class, subclass, and\r
 // an operation.\r
 //\r
 // A Status Code Value is made up of the class, subclass, and\r
 // an operation.\r
 //\r

-#define EFI_STATUS_CODE_CLASS_MASK                     0xFF000000\r
-#define EFI_STATUS_CODE_SUBCLASS_MASK  0x00FF0000\r
-#define EFI_STATUS_CODE_OPERATION_MASK         0x0000FFFF\r
+#define EFI_STATUS_CODE_CLASS_MASK      0xFF000000\r
+#define EFI_STATUS_CODE_SUBCLASS_MASK   0x00FF0000\r
+#define EFI_STATUS_CODE_OPERATION_MASK  0x0000FFFF\r

 //\r
 // Definition of Status Code extended data header.\r
 // The data will follow HeaderSize bytes from the beginning of\r
 // the structure and is Size bytes long.\r
 //\r
 typedef struct {\r
 //\r
 // Definition of Status Code extended data header.\r
 // The data will follow HeaderSize bytes from the beginning of\r
 // the structure and is Size bytes long.\r
 //\r
 typedef struct {\r

-       UINT16          HeaderSize;\r
-       UINT16          Size;\r
-       EFI_GUID        Type;\r
+  UINT16    HeaderSize;\r
+  UINT16    Size;\r
+  EFI_GUID  Type;\r

 } EFI_STATUS_CODE_DATA;\r
 \r
 #endif\r
 } EFI_STATUS_CODE_DATA;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 059b90b08495a6eff144f695f94ffc8f4c3e83af..8b82225c47157b0e05f96150f485b1039ab4fa58 100644 (file)
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -28,8 +28,8 @@
 //\r
 // Handles of EFI FV/FFS.\r
 // \r
 //\r
 // Handles of EFI FV/FFS.\r
 // \r

-typedef VOID           *EFI_PEI_FV_HANDLE;\r
-typedef VOID           *EFI_PEI_FILE_HANDLE;\r
+typedef VOID    *EFI_PEI_FV_HANDLE;\r
+typedef VOID    *EFI_PEI_FILE_HANDLE;\r

 \r
 //\r
 // Declare forward referenced data structures\r
 \r
 //\r
 // Declare forward referenced data structures\r


@@ -54,7 +54,7 @@ typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEIM_ENTRY_POINT)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEIM_ENTRY_POINT)(\r

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r

   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r


@@ -104,10 +104,10 @@ struct _EFI_PEI_NOTIFY_DESCRIPTOR {
 // this HOB is produced and consumed during the HOB producer phase.\r
 // \r
 typedef struct _EFI_HOB_LOAD_PEIM {\r
 // this HOB is produced and consumed during the HOB producer phase.\r
 // \r
 typedef struct _EFI_HOB_LOAD_PEIM {\r

-       EFI_HOB_GENERIC_HEADER            Header;\r
-       EFI_PEI_FILE_HANDLE               FileHandle;\r
-       EFI_PEIM_ENTRY_POINT              EntryPoint;\r
-       EFI_PEIM_ENTRY_POINT              InMemEntryPoint;\r
+  EFI_HOB_GENERIC_HEADER            Header;\r
+  EFI_PEI_FILE_HANDLE               FileHandle;\r
+  EFI_PEIM_ENTRY_POINT              EntryPoint;\r
+  EFI_PEIM_ENTRY_POINT              InMemEntryPoint;\r

 } EFI_HOB_LOAD_PEIM;\r
 \r
 \r
 } EFI_HOB_LOAD_PEIM;\r
 \r
 \r


@@ -499,69 +499,69 @@ EFI_STATUS
 \r
 /**\r
    \r
 \r
 /**\r
    \r

-       This service searches for files with a specific name, within\r
-       either the specified firmware volume or all firmware volumes.\r
-       The service returns a file handle of type EFI_PEI_FILE_HANDLE,\r
+  This service searches for files with a specific name, within\r
+  either the specified firmware volume or all firmware volumes.\r
+  The service returns a file handle of type EFI_PEI_FILE_HANDLE,\r

   which must be unique within the system.\r
 \r
   which must be unique within the system.\r
 \r

-  @param FileName                      A pointer to the name of the file to\r
-                                                                                               find within the firmware volume.\r
+  @param FileName       A pointer to the name of the file to\r
+                        find within the firmware volume.\r

 \r
 \r

-  @param VolumeHandle  The firmware volume to search FileHandle\r
+  @param VolumeHandle   The firmware volume to search FileHandle\r

                         Upon exit, points to the found file's\r
                         handle or NULL if it could not be found.\r
 \r
                         Upon exit, points to the found file's\r
                         handle or NULL if it could not be found.\r
 \r

-  @retval EFI_SUCCESS                                          File was found.\r
+  @retval EFI_SUCCESS             File was found.\r

 \r
 \r

-  @retval EFI_NOT_FOUND                                        File was not found.\r
+  @retval EFI_NOT_FOUND           File was not found.\r

 \r
 \r

-  @retval EFI_INVALID_PARAMETER        VolumeHandle or FileHandle or\r
-                                                                                                                                       FileName was NULL.\r
+  @retval EFI_INVALID_PARAMETER   VolumeHandle or FileHandle or\r
+                                  FileName was NULL.\r

 \r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_FIND_BY_NAME) (\r
 \r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_FIND_BY_NAME) (\r

-       IN CONST        EFI_GUID                                                *FileName,\r
-       IN CONST        EFI_PEI_FV_HANDLE       VolumeHandle,\r
-       OUT                     EFI_PEI_FILE_HANDLE *FileHandle\r
-);\r
+  IN CONST  EFI_GUID            *FileName,\r
+  IN CONST  EFI_PEI_FV_HANDLE   VolumeHandle,\r
+  OUT       EFI_PEI_FILE_HANDLE *FileHandle\r
+  );\r

 \r
 \r
 /**\r
    \r
 \r
 \r
 /**\r
    \r

-  @param FileName      Name of the file.\r
+  @param FileName   Name of the file.\r

 \r
 \r

-  @param FileType      File type. See EFI_FV_FILETYPE, which is\r
+  @param FileType   File type. See EFI_FV_FILETYPE, which is\r

                     defined in the Platform Initialization\r
                     Firmware Storage Specification.\r
 \r
                     defined in the Platform Initialization\r
                     Firmware Storage Specification.\r
 \r

-  @param FileAttributes        Attributes of the file. Type\r
+  @param FileAttributes   Attributes of the file. Type\r

                           EFI_FV_FILE_ATTRIBUTES is defined in\r
                           the Platform Initialization Firmware\r
                           Storage Specification.\r
 \r
                           EFI_FV_FILE_ATTRIBUTES is defined in\r
                           the Platform Initialization Firmware\r
                           Storage Specification.\r
 \r

-  @param Buffer        Points to the file's data (not the header).\r
+  @param Buffer   Points to the file's data (not the header).\r

                   Not valid if EFI_FV_FILE_ATTRIB_MEMORY_MAPPED\r
                   is zero.\r
 \r
                   Not valid if EFI_FV_FILE_ATTRIB_MEMORY_MAPPED\r
                   is zero.\r
 \r

-  @param BufferSize    Size of the file's data.\r
+  @param BufferSize   Size of the file's data.\r

 \r
 **/\r
 typedef struct {\r
 \r
 **/\r
 typedef struct {\r

-       EFI_GUID                                                                FileName;\r
-       EFI_FV_FILETYPE                                 FileType;\r
-       EFI_FV_FILE_ATTRIBUTES  FileAttributes;\r
-       VOID                                                                            *Buffer;\r
-       UINT32                                                                  BufferSize;\r
+  EFI_GUID                FileName;\r
+  EFI_FV_FILETYPE         FileType;\r
+  EFI_FV_FILE_ATTRIBUTES  FileAttributes;\r
+  VOID                    *Buffer;\r
+  UINT32                  BufferSize;\r

 } EFI_FV_FILE_INFO;\r
 \r
 /**\r
    \r
 } EFI_FV_FILE_INFO;\r
 \r
 /**\r
    \r

-       This function returns information about a specific file,\r
-       including its file name, type, attributes, starting address and\r
-       size. If the firmware volume is not memory mapped then the\r
+  This function returns information about a specific file,\r
+  including its file name, type, attributes, starting address and\r
+  size. If the firmware volume is not memory mapped then the\r

   Buffer member will be NULL.\r
 \r
   @param FileHandle   Handle of the file.\r
   Buffer member will be NULL.\r
 \r
   @param FileHandle   Handle of the file.\r


@@ -569,58 +569,58 @@ typedef struct {
   @param FileInfo     Upon exit, points to the file¡¯s\r
                       information.\r
 \r
   @param FileInfo     Upon exit, points to the file¡¯s\r
                       information.\r
 \r

-  @retval EFI_SUCCESS                                          File information returned.\r
+  @retval EFI_SUCCESS             File information returned.\r

   \r
   \r

-  @retval EFI_INVALID_PARAMETER        If FileHandle does not\r
+  @retval EFI_INVALID_PARAMETER   If FileHandle does not\r

                                   represent a valid file.\r
   \r
                                   represent a valid file.\r
   \r

-  @retval EFI_INVALID_PARAMETER        If FileInfo is NULL.\r
+  @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r

   \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_GET_FILE_INFO) (\r
   \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_GET_FILE_INFO) (\r

-       IN CONST        EFI_PEI_FILE_HANDLE     FileHandle,\r
-       OUT                     EFI_FV_FILE_INFO                        *FileInfo\r
-);\r
+  IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,\r
+  OUT       EFI_FV_FILE_INFO      *FileInfo\r
+  );\r

 \r
 \r
 /**\r
    \r
 \r
 \r
 /**\r
    \r

-  @param FvAttributes  Attributes of the firmware volume. Type\r
+  @param FvAttributes   Attributes of the firmware volume. Type\r

                         EFI_FVB_ATTRIBUTES is defined in the\r
                         Platform Initialization Firmware Storage\r
                         Specficiation.\r
 \r
                         EFI_FVB_ATTRIBUTES is defined in the\r
                         Platform Initialization Firmware Storage\r
                         Specficiation.\r
 \r

-  @param FvFormat                      Format of the firmware volume. For PI\r
+  @param FvFormat       Format of the firmware volume. For PI\r

                         Architecture Firmware Volumes, this can\r
                         be copied from FileSystemGuid in\r
                         EFI_FIRMWARE_VOLUME_HEADER.\r
 \r
                         Architecture Firmware Volumes, this can\r
                         be copied from FileSystemGuid in\r
                         EFI_FIRMWARE_VOLUME_HEADER.\r
 \r

-  @param FvName                                Name of the firmware volume. For PI\r
+  @param FvName         Name of the firmware volume. For PI\r

                         Architecture Firmware Volumes, this can\r
                         be copied from VolumeName in the\r
                         extended header of\r
                         EFI_FIRMWARE_VOLUME_HEADER.\r
 \r
                         Architecture Firmware Volumes, this can\r
                         be copied from VolumeName in the\r
                         extended header of\r
                         EFI_FIRMWARE_VOLUME_HEADER.\r
 \r

-  @param FvStart                               Points to the first byte of the firmware\r
+  @param FvStart        Points to the first byte of the firmware\r

                         volume, if bit EFI_FVB_MEMORY_MAPPED is\r
                         set in FvAttributes. FvSize Size of the\r
                         firmware volume.\r
 \r
 **/\r
 typedef struct {\r
                         volume, if bit EFI_FVB_MEMORY_MAPPED is\r
                         set in FvAttributes. FvSize Size of the\r
                         firmware volume.\r
 \r
 **/\r
 typedef struct {\r

-       EFI_FVB_ATTRIBUTES      FvAttributes;\r
-       EFI_GUID                                                FvFormat;\r
-       EFI_GUID                                                FvName;\r
-       VOID                                                            *FvStart;\r
-       UINT64                                                  FvSize;\r
+  EFI_FVB_ATTRIBUTES  FvAttributes;\r
+  EFI_GUID            FvFormat;\r
+  EFI_GUID            FvName;\r
+  VOID                *FvStart;\r
+  UINT64              FvSize;\r

 } EFI_FV_INFO;\r
 \r
 /**\r
    \r
 } EFI_FV_INFO;\r
 \r
 /**\r
    \r

-       This function returns information about a specific firmware\r
-       volume, including its name, type, attributes, starting address\r
+  This function returns information about a specific firmware\r
+  volume, including its name, type, attributes, starting address\r

   and size.\r
 \r
   @param VolumeHandle   Handle of the volume.\r
   and size.\r
 \r
   @param VolumeHandle   Handle of the volume.\r


@@ -628,51 +628,51 @@ typedef struct {
   @param VolumeInfo     Upon exit, points to the volume¡¯s\r
                         information.\r
 \r
   @param VolumeInfo     Upon exit, points to the volume¡¯s\r
                         information.\r
 \r

-       @retval EFI_SUCCESS                                             File information returned.\r
+  @retval EFI_SUCCESS             File information returned.\r

   \r
   \r

-  @retval EFI_INVALID_PARAMETER        If FileHandle does not\r
+  @retval EFI_INVALID_PARAMETER   If FileHandle does not\r

                                   represent a valid file.\r
   \r
                                   represent a valid file.\r
   \r

-  @retval EFI_INVALID_PARAMETER        If FileInfo is NULL.\r
+  @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r

 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_GET_VOLUME_INFO) (\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_GET_VOLUME_INFO) (\r

-       IN CONST        EFI_PEI_FV_HANDLE       *VolumeHandle,\r
-       OUT                     EFI_FV_INFO                     *VolumeInfo\r
-);\r
+  IN CONST  EFI_PEI_FV_HANDLE *VolumeHandle,\r
+  OUT       EFI_FV_INFO       *VolumeInfo\r
+  );\r

 \r
 /**\r
    \r
 \r
 /**\r
    \r

-       This service registers a file handle so that after memory is\r
-       available, the PEIM will be re-loaded into permanent memory and\r
-       re-initialized. The PEIM registered this way will always be\r
-       initialized twice. The first time, this function call will\r
-       return EFI_SUCCESS. The second time, this function call will\r
-       return EFI_ALREADY_STARTED. Depending on the order in which\r
-       PEIMs are dispatched, the PEIM making this call may be\r
-       initialized after permanent memory is installed, even the first\r
+  This service registers a file handle so that after memory is\r
+  available, the PEIM will be re-loaded into permanent memory and\r
+  re-initialized. The PEIM registered this way will always be\r
+  initialized twice. The first time, this function call will\r
+  return EFI_SUCCESS. The second time, this function call will\r
+  return EFI_ALREADY_STARTED. Depending on the order in which\r
+  PEIMs are dispatched, the PEIM making this call may be\r
+  initialized after permanent memory is installed, even the first\r

   time.\r
 \r
   time.\r
 \r

-  @param FileHandle    PEIM¡¯s file handle. Must be the currently\r
+  @param FileHandle   PEIM¡¯s file handle. Must be the currently\r

                       xecuting PEIM.\r
   \r
                       xecuting PEIM.\r
   \r

-  @retval EFI_SUCCESS  The PEIM was successfully registered for\r
+  @retval EFI_SUCCESS   The PEIM was successfully registered for\r

                         shadowing.\r
 \r
                         shadowing.\r
 \r

-  @retval EFI_ALREADY_STARTED  The PEIM was previously\r
+  @retval EFI_ALREADY_STARTED   The PEIM was previously\r

                                 registered for shadowing.\r
 \r
                                 registered for shadowing.\r
 \r

-  @retval EFI_NOT_FOUND        The FileHandle does not refer to a\r
-                                                                                                       valid file handle.\r
+  @retval EFI_NOT_FOUND   The FileHandle does not refer to a\r
+                          valid file handle.\r

 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_REGISTER_FOR_SHADOW) (\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_REGISTER_FOR_SHADOW) (\r

-       IN CONST        EFI_PEI_FILE_HANDLE FileHandle\r
-);\r
+  IN CONST  EFI_PEI_FILE_HANDLE FileHandle\r
+  );\r

 \r
 \r
 //\r
 \r
 \r
 //\r


@@ -684,63 +684,63 @@ EFI_STATUS
 //\r
 // PEI Services Table\r
 //\r
 //\r
 // PEI Services Table\r
 //\r

-#define PEI_SERVICES_SIGNATURE         0x5652455320494550\r
-#define PEI_SERVICES_REVISION  (PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION)\r
+#define PEI_SERVICES_SIGNATURE  0x5652455320494550\r
+#define PEI_SERVICES_REVISION   (PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION)\r

 \r
 struct EFI_PEI_SERVICES {\r
 \r
 struct EFI_PEI_SERVICES {\r

-       EFI_TABLE_HEADER                                                Hdr;\r
-       //\r
-       // PPI Functions\r
-       //\r
-       EFI_PEI_INSTALL_PPI                             InstallPpi;\r
-       EFI_PEI_REINSTALL_PPI                   ReInstallPpi;\r
-       EFI_PEI_LOCATE_PPI                                      LocatePpi;\r
-       EFI_PEI_NOTIFY_PPI                                      NotifyPpi;\r
-       //\r
-       // Boot Mode Functions\r
-       //\r
-       EFI_PEI_GET_BOOT_MODE                   GetBootMode;\r
-       EFI_PEI_SET_BOOT_MODE                   SetBootMode;\r
-       //\r
-       // HOB Functions\r
-       //\r
-       EFI_PEI_GET_HOB_LIST                            GetHobList;\r
-       EFI_PEI_CREATE_HOB                                      CreateHob;\r
-       //\r
-       // Firmware Volume Functions\r
-       //\r
-       EFI_PEI_FFS_FIND_NEXT_VOLUME2   FfsFindNextVolume;\r
-       EFI_PEI_FFS_FIND_NEXT_FILE2             FfsFindNextFile;\r
-       EFI_PEI_FFS_FIND_SECTION_DATA2  FfsFindSectionData;\r
-       //\r
-       // PEI Memory Functions\r
-       //\r
-       EFI_PEI_INSTALL_PEI_MEMORY      InstallPeiMemory;\r
-       EFI_PEI_ALLOCATE_PAGES                  AllocatePages;\r
-       EFI_PEI_ALLOCATE_POOL                   AllocatePool;\r
-       EFI_PEI_COPY_MEM                                                CopyMem;\r
-       EFI_PEI_SET_MEM                                                 SetMem;\r
-       //\r
-       // Status Code\r
-       EFI_PEI_REPORT_STATUS_CODE      ReportStatusCode;\r
-       //\r
-       // Reset\r
-       //\r
-       EFI_PEI_RESET_SYSTEM                            ResetSystem;\r
-       //\r
-       // (the following interfaces are installed by publishing PEIM)\r
-       //\r
-       // I/O Abstractions\r
-       //\r
-       EFI_PEI_CPU_IO_PPI                                      *CpuIo;\r
-       EFI_PEI_PCI_CFG2_PPI                            *PciCfg;\r
-       //\r
-       // Future Installed Services\r
-       EFI_PEI_FFS_FIND_BY_NAME                FfsFindFileByName;\r
-       EFI_PEI_FFS_GET_FILE_INFO       FfsGetFileInfo;\r
-       EFI_PEI_FFS_GET_VOLUME_INFO FfsGetVolumeInfo;\r
-       EFI_PEI_REGISTER_FOR_SHADOW RegisterForShadow;\r
-} ;\r
+  EFI_TABLE_HEADER            Hdr;\r
+  //\r
+  // PPI Functions\r
+  //\r
+  EFI_PEI_INSTALL_PPI         InstallPpi;\r
+  EFI_PEI_REINSTALL_PPI       ReInstallPpi;\r
+  EFI_PEI_LOCATE_PPI          LocatePpi;\r
+  EFI_PEI_NOTIFY_PPI          NotifyPpi;\r
+  //\r
+  // Boot Mode Functions\r
+  //\r
+  EFI_PEI_GET_BOOT_MODE       GetBootMode;\r
+  EFI_PEI_SET_BOOT_MODE       SetBootMode;\r
+  //\r
+  // HOB Functions\r
+  //\r
+  EFI_PEI_GET_HOB_LIST        GetHobList;\r
+  EFI_PEI_CREATE_HOB          CreateHob;\r
+  //\r
+  // Firmware Volume Functions\r
+  //\r
+  EFI_PEI_FFS_FIND_NEXT_VOLUME2   FfsFindNextVolume;\r
+  EFI_PEI_FFS_FIND_NEXT_FILE2     FfsFindNextFile;\r
+  EFI_PEI_FFS_FIND_SECTION_DATA2  FfsFindSectionData;\r
+  //\r
+  // PEI Memory Functions\r
+  //\r
+  EFI_PEI_INSTALL_PEI_MEMORY  InstallPeiMemory;\r
+  EFI_PEI_ALLOCATE_PAGES      AllocatePages;\r
+  EFI_PEI_ALLOCATE_POOL       AllocatePool;\r
+  EFI_PEI_COPY_MEM            CopyMem;\r
+  EFI_PEI_SET_MEM             SetMem;\r
+  //\r
+  // Status Code\r
+  EFI_PEI_REPORT_STATUS_CODE  ReportStatusCode;\r
+  //\r
+  // Reset\r
+  //\r
+  EFI_PEI_RESET_SYSTEM        ResetSystem;\r
+  //\r
+  // (the following interfaces are installed by publishing PEIM)\r
+  //\r
+  // I/O Abstractions\r
+  //\r
+  EFI_PEI_CPU_IO_PPI          *CpuIo;\r
+  EFI_PEI_PCI_CFG2_PPI        *PciCfg;\r
+  //\r
+  // Future Installed Services\r
+  EFI_PEI_FFS_FIND_BY_NAME    FfsFindFileByName;\r
+  EFI_PEI_FFS_GET_FILE_INFO   FfsGetFileInfo;\r
+  EFI_PEI_FFS_GET_VOLUME_INFO FfsGetVolumeInfo;\r
+  EFI_PEI_REGISTER_FOR_SHADOW RegisterForShadow;\r
+};\r

 \r
 \r
 typedef struct _EFI_SEC_PEI_HAND_OFF {\r
 \r
 \r
 typedef struct _EFI_SEC_PEI_HAND_OFF {\r

diff --git a/MdePkg/Include/Ppi/Decompress.h b/MdePkg/Include/Ppi/Decompress.h
index 21ef964c597df729ab079dd7c9d98ed98ee8d7be..097dc9303ce9af73c4ed84ee0e592dda64de10d3 100644 (file)
--- a/MdePkg/Include/Ppi/Decompress.h
+++ b/MdePkg/Include/Ppi/Decompress.h
@@ -21,60 +21,60 @@
 #define __DECOMPRESS_PPI_H__\r
 \r
 #define EFI_PEI_DECOMPRESS_PPI_GUID \\r
 #define __DECOMPRESS_PPI_H__\r
 \r
 #define EFI_PEI_DECOMPRESS_PPI_GUID \\r

-       { 0x1a36e4e7, 0xfab6, 0x476a, { 0x8e, 0x75, 0x69, 0x5a, 0x5, 0x76, 0xfd, 0xd7 } }\r
+  { 0x1a36e4e7, 0xfab6, 0x476a, { 0x8e, 0x75, 0x69, 0x5a, 0x5, 0x76, 0xfd, 0xd7 } }\r

 \r
 \r

-typedef struct _EFI_PEI_DECOMPRESS_PPI         EFI_PEI_DECOMPRESS_PPI;;\r
+typedef struct _EFI_PEI_DECOMPRESS_PPI  EFI_PEI_DECOMPRESS_PPI;;\r

 \r
 /**                                                              \r
   Decompresses the data in a compressed section and returns it\r
   as a series of standard PI Firmware File Sections. The\r
   required memory is allocated from permanent memory.\r
 \r
 \r
 /**                                                              \r
   Decompresses the data in a compressed section and returns it\r
   as a series of standard PI Firmware File Sections. The\r
   required memory is allocated from permanent memory.\r
 \r

-  @param This                          Points to this instance of the\r
-                                                                                       EFI_PEI_DECOMPRESS_PEI PPI. InputSection Points to\r
-                                                                                       the compressed section.\r
+  @param This         Points to this instance of the\r
+                      EFI_PEI_DECOMPRESS_PEI PPI. InputSection Points to\r
+                      the compressed section.\r

 \r
   @param OutputBuffer Holds the returned pointer to the\r
                       decompressed sections.\r
 \r
 \r
   @param OutputBuffer Holds the returned pointer to the\r
                       decompressed sections.\r
 \r

-  @param OutputSize    Holds the returned size of the decompress\r
+  @param OutputSize   Holds the returned size of the decompress\r

                       section streams.\r
 \r
                       section streams.\r
 \r

-  @retval EFI_SUCCESS                                  The section was decompressed\r
-                                                                                                                               successfully. OutputBuffer contains the\r
-                                                                                                                               resulting data and OutputSize contains\r
-                                                                                                                               the resulting size.\r
+  @retval EFI_SUCCESS           The section was decompressed\r
+                                successfully. OutputBuffer contains the\r
+                                resulting data and OutputSize contains\r
+                                the resulting size.\r

 \r
 \r

-  @retval EFI_OUT_OF_RESOURCES         Unable to allocate sufficient\r
+  @retval EFI_OUT_OF_RESOURCES  Unable to allocate sufficient\r

                                 memory to hold the decompressed data.\r
 \r
                                 memory to hold the decompressed data.\r
 \r

-  @retval      EFI_UNSUPPORTED                         The compression type specified\r
-                                                                                                                               in the compression header is unsupported.\r
+  @retval EFI_UNSUPPORTED       The compression type specified\r
+                                in the compression header is unsupported.\r

 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_DECOMPRESS_DECOMPRESS)(\r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_DECOMPRESS_DECOMPRESS)(\r

-       IN CONST        EFI_PEI_DECOMPRESS_PPI  *This,\r
-       IN CONST        EFI_COMPRESSION_SECTION *InputSection,\r
-       OUT                     VOID                                                                            **OutputBuffer,\r
-       OUT                     UINTN                                                                   *OutputSize\r
+  IN CONST  EFI_PEI_DECOMPRESS_PPI  *This,\r
+  IN CONST  EFI_COMPRESSION_SECTION *InputSection,\r
+  OUT       VOID                    **OutputBuffer,\r
+  OUT       UINTN                   *OutputSize\r

 );\r
 \r
 \r
 /**                                                              \r
   This PPI¡¯s single member function decompresses a compression\r
 );\r
 \r
 \r
 /**                                                              \r
   This PPI¡¯s single member function decompresses a compression\r

-       encapsulated section. It is used by the PEI Foundation to\r
-       process sectioned files. Prior to the installation of this PPI,\r
+  encapsulated section. It is used by the PEI Foundation to\r
+  process sectioned files. Prior to the installation of this PPI,\r

   compression sections will be ignored.\r
 \r
   compression sections will be ignored.\r
 \r

-  @param       Decompress      Decompress a single compression section in\r
+  @param  Decompress  Decompress a single compression section in\r

                      a firmware file.\r
 **/\r
 struct _EFI_PEI_DECOMPRESS_PPI {\r
                      a firmware file.\r
 **/\r
 struct _EFI_PEI_DECOMPRESS_PPI {\r

-       EFI_PEI_DECOMPRESS_DECOMPRESS Decompress;\r
+  EFI_PEI_DECOMPRESS_DECOMPRESS Decompress;\r

 };\r
 \r
 \r
 };\r
 \r
 \r

-extern EFI_GUID                gEfiPeiDecompressPpiGuid;\r
+extern EFI_GUID   gEfiPeiDecompressPpiGuid;\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Ppi/FirmwareVolume.h b/MdePkg/Include/Ppi/FirmwareVolume.h
index 3cafd0c00316c23eeebb7d6c656d18c6c9bcd2be..953ea6ac60b108a4d3048769aee603a7e77fa000 100644 (file)
--- a/MdePkg/Include/Ppi/FirmwareVolume.h
+++ b/MdePkg/Include/Ppi/FirmwareVolume.h
@@ -27,7 +27,7 @@
 // EFI_FIRMWARE_FILE_SYSTEM2_GUID is the PI Firmware Volume format.\r
 // \r
 \r
 // EFI_FIRMWARE_FILE_SYSTEM2_GUID is the PI Firmware Volume format.\r
 // \r
 \r

-typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI            EFI_PEI_FIRMWARE_VOLUME_PPI;\r
+typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI   EFI_PEI_FIRMWARE_VOLUME_PPI;\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -40,26 +40,26 @@ typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI         EFI_PEI_FIRMWARE_VOLUME_PPI;
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r
   \r
   \r
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r
   \r
   \r

-  @param This        Points to this instance of the\r
+  @param This         Points to this instance of the\r

                       EFI_PEI_FIRMWARE_VOLUME_PPI\r
                       EFI_PEI_FIRMWARE_VOLUME_PPI\r

-  @param Buffer                        Points to the start of the buffer.\r
-  @param BufferSize    Size of the buffer.\r
-  @param FvHandle              Points to the returned firmware volume\r
+  @param Buffer       Points to the start of the buffer.\r
+  @param BufferSize   Size of the buffer.\r
+  @param FvHandle     Points to the returned firmware volume\r

                       handle. The firmware volume handle must\r
                       be unique within the system. \r
 \r
 \r
                       handle. The firmware volume handle must\r
                       be unique within the system. \r
 \r
 \r

-  @retval EFI_SUCCESS                                  Firmware volume handle.\r
-  @retval EFI_VOLUME_CORRUPTED         Volume was corrupt.\r
+  @retval EFI_SUCCESS           Firmware volume handle.\r
+  @retval EFI_VOLUME_CORRUPTED  Volume was corrupt.\r

 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_PROCESS_FV) (\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_PROCESS_FV) (\r

-       IN CONST        EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
-       IN CONST        VOID                                                                                            *Buffer,\r
-       IN CONST        UINTN                                                                                   BufferSize,\r
-       OUT                     EFI_PEI_FV_HANDLE                                       *FvHandle\r
+  IN CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
+  IN CONST  VOID                        *Buffer,\r
+  IN CONST  UINTN                       BufferSize,\r
+  OUT       EFI_PEI_FV_HANDLE           *FvHandle\r

 );\r
 \r
 \r
 );\r
 \r
 \r


@@ -73,76 +73,76 @@ EFI_STATUS
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r
   \r
   \r
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r
   \r
   \r

-  @param This        Points to this instance of the\r
+  @param This         Points to this instance of the\r

                       EFI_PEI_FIRMWARE_VOLUME_PPI\r
                       EFI_PEI_FIRMWARE_VOLUME_PPI\r

-  @param Buffer                        Points to the start of the buffer.\r
-  @param BufferSize    Size of the buffer.\r
-  @param FvHandle              Points to the returned firmware volume\r
+  @param Buffer       Points to the start of the buffer.\r
+  @param BufferSize   Size of the buffer.\r
+  @param FvHandle     Points to the returned firmware volume\r

                       handle. The firmware volume handle must\r
                       be unique within the system. \r
 \r
 \r
                       handle. The firmware volume handle must\r
                       be unique within the system. \r
 \r
 \r

-  @retval EFI_SUCCESS                                  Firmware volume handle.\r
-  @retval EFI_VOLUME_CORRUPTED         Volume was corrupt.\r
+  @retval EFI_SUCCESS           Firmware volume handle.\r
+  @retval EFI_VOLUME_CORRUPTED  Volume was corrupt.\r

 \r
 **/\r
 \r
 /**\r
   This service enables PEI modules to discover additional firmware files. The FileHandle must be\r
 \r
 **/\r
 \r
 /**\r
   This service enables PEI modules to discover additional firmware files. The FileHandle must be\r

-       unique within the system.\r
+  unique within the system.\r

 \r
 \r

-  @param This                  Points to this instance of the\r
-                                                                               EFI_PEI_FIRMWARE_VOLUME_PPI. SearchType A filter\r
-                                                                               to find only files of this type. Type\r
-                                                                               EFI_FV_FILETYPE_ALL causes no filtering to be\r
-                                                                               done.\r
-  @param FvHandle      Handle of firmware volume in which to\r
-                                                                               search.\r
+  @param This       Points to this instance of the\r
+                    EFI_PEI_FIRMWARE_VOLUME_PPI. SearchType A filter\r
+                    to find only files of this type. Type\r
+                    EFI_FV_FILETYPE_ALL causes no filtering to be\r
+                    done.\r
+  @param FvHandle   Handle of firmware volume in which to\r
+                    search.\r

 \r
 \r

-  @param FileHandle    Points to the current handle from which to\r
+  @param FileHandle Points to the current handle from which to\r

                     begin searching or NULL to start at the\r
                     beginning of the firmware volume. Updated\r
                     upon return to reflect the file found.\r
 \r
 \r
                     begin searching or NULL to start at the\r
                     beginning of the firmware volume. Updated\r
                     upon return to reflect the file found.\r
 \r
 \r

-  @retval EFI_SUCCESS  The file was found.\r
+  @retval EFI_SUCCESS   The file was found.\r

   @retval EFI_NOT_FOUND The file was not found. FileHandle\r
   @retval EFI_NOT_FOUND The file was not found. FileHandle\r

-                                                                                               contains NULL.\r
+                        contains NULL.\r

 **/ \r
 typedef EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_FIND_FILE_TYPE) ( \r
 **/ \r
 typedef EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_FIND_FILE_TYPE) ( \r

-       IN CONST        EFI_PEI_FIRMWARE_VOLUME_PPI     *This, \r
-       IN CONST  EFI_FV_FILETYPE                                                       SearchType, \r
-       IN CONST  EFI_PEI_FV_HANDLE                                             FvHandle,\r
-       IN OUT EFI_PEI_FILE_HANDLE                                                      *FileHandle \r
+  IN CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
+  IN CONST  EFI_FV_FILETYPE               SearchType, \r
+  IN CONST  EFI_PEI_FV_HANDLE             FvHandle,\r
+  IN OUT EFI_PEI_FILE_HANDLE              *FileHandle \r

 );\r
 \r
 \r
 /**\r
    \r
 );\r
 \r
 \r
 /**\r
    \r

-       This service searches for files with a specific name, within\r
-       either the specified firmware volume or all firmware volumes.\r
+  This service searches for files with a specific name, within\r
+  either the specified firmware volume or all firmware volumes.\r

 \r
   @param This   Points to this instance of the\r
                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 \r
 \r
   @param This   Points to this instance of the\r
                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 \r

-  @param FileName      A pointer to the name of the file to find\r
+  @param FileName   A pointer to the name of the file to find\r

                     within the firmware volume.\r
 \r
                     within the firmware volume.\r
 \r

-  @param FvHandle      Upon entry, the pointer to the firmware\r
+  @param FvHandle   Upon entry, the pointer to the firmware\r

                     volume to search or NULL if all firmware\r
                     volumes should be searched. Upon exit, the\r
                     actual firmware volume in which the file was\r
                     found.\r
 \r
                     volume to search or NULL if all firmware\r
                     volumes should be searched. Upon exit, the\r
                     actual firmware volume in which the file was\r
                     found.\r
 \r

-  @param FileHandle    Upon exit, points to the found file's\r
+  @param FileHandle   Upon exit, points to the found file's\r

                       handle or NULL if it could not be found.\r
 \r
                       handle or NULL if it could not be found.\r
 \r

-  @retval EFI_SUCCESS  File was found.\r
+  @retval EFI_SUCCESS   File was found.\r

 \r
 \r

-  @param EFI_NOT_FOUND         File was not found.\r
+  @param EFI_NOT_FOUND  File was not found.\r

 \r
 \r

-  @param EFI_INVALID_PARAMETER         FvHandle or FileHandle or\r
+  @param EFI_INVALID_PARAMETER  FvHandle or FileHandle or\r

                                 FileName was NULL.\r
 \r
 \r
                                 FileName was NULL.\r
 \r
 \r


@@ -150,29 +150,29 @@ typedef EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_FIND_FILE_NAME) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_FIND_FILE_NAME) (\r

-       IN CONST        EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
-       IN CONST        EFI_GUID                                                                                *FileName,\r
-       IN CONST        EFI_PEI_FV_HANDLE                                       FvHandle,\r
-       OUT                     EFI_PEI_FILE_HANDLE                             *FileHandle\r
+  IN CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
+  IN CONST  EFI_GUID                    *FileName,\r
+  IN CONST  EFI_PEI_FV_HANDLE           FvHandle,\r
+  OUT       EFI_PEI_FILE_HANDLE         *FileHandle\r

 );\r
 \r
 \r
 /**\r
   This function returns information about a specific\r
 );\r
 \r
 \r
 /**\r
   This function returns information about a specific\r

-       file, including its file name, type, attributes, starting\r
+  file, including its file name, type, attributes, starting\r

   address and size. \r
    \r
   address and size. \r
    \r

-  @param This                  Points to this instance of the\r
-                                                                               EFI_PEI_FIRMWARE_VOLUME_PPI.\r
+  @param This       Points to this instance of the\r
+                    EFI_PEI_FIRMWARE_VOLUME_PPI.\r

 \r
   @param FileHandle Handle of the file.\r
 \r
 \r
   @param FileHandle Handle of the file.\r
 \r

-  @param FileInfo      Upon exit, points to the file????s\r
-                                                                               information.\r
+  @param FileInfo   Upon exit, points to the file????s\r
+                    information.\r

 \r
 \r

-  @retval EFI_SUCCESS                                          File information returned.\r
+  @retval EFI_SUCCESS             File information returned.\r

   \r
   \r

-  @retval EFI_INVALID_PARAMETER        If FileHandle does not\r
+  @retval EFI_INVALID_PARAMETER   If FileHandle does not\r

                                   represent a valid file.\r
                                   EFI_INVALID_PARAMETER If\r
                                   FileInfo is NULL\r
                                   represent a valid file.\r
                                   EFI_INVALID_PARAMETER If\r
                                   FileInfo is NULL\r


@@ -181,88 +181,88 @@ EFI_STATUS
 \r
 typedef\r
 EFI_STATUS (EFIAPI *EFI_PEI_FV_GET_FILE_INFO) (\r
 \r
 typedef\r
 EFI_STATUS (EFIAPI *EFI_PEI_FV_GET_FILE_INFO) (\r

-       IN      CONST   EFI_PEI_FIRMWARE_VOLUME_PPI     *This, \r
-       IN  CONST       EFI_PEI_FILE_HANDLE                                     FileHandle, \r
-       OUT                     EFI_FV_FILE_INFO                                                        *FileInfo\r
+  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
+  IN  CONST EFI_PEI_FILE_HANDLE           FileHandle, \r
+  OUT       EFI_FV_FILE_INFO              *FileInfo\r

 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-       This function returns information about the firmware\r
+  This function returns information about the firmware\r

   volume.\r
   \r
   volume.\r
   \r

-  @param This                  Points to this instance of the\r
-                                                                               EFI_PEI_FIRMWARE_VOLUME_PPI.\r
+  @param This       Points to this instance of the\r
+                    EFI_PEI_FIRMWARE_VOLUME_PPI.\r

   \r
   \r

-  @param FvHandle      Handle to the firmware handle.\r
+  @param FvHandle   Handle to the firmware handle.\r

   \r
   @param VolumeInfo Points to the returned firmware volume\r
                     information.\r
   \r
   \r
   \r
   @param VolumeInfo Points to the returned firmware volume\r
                     information.\r
   \r
   \r

-  @retval EFI_SUCCESS                                          Information returned\r
+  @retval EFI_SUCCESS             Information returned\r

                                   successfully.\r
   \r
                                   successfully.\r
   \r

-  @retval EFI_INVALID_PARAMETER        FvHandle does not indicate a\r
-                                                                                                                                       valid firmware volume or VolumeInfo is NULL\r
+  @retval EFI_INVALID_PARAMETER   FvHandle does not indicate a\r
+                                  valid firmware volume or VolumeInfo is NULL\r

 **/ \r
 typedef\r
 EFI_STATUS (EFIAPI *EFI_PEI_FV_GET_INFO)(\r
 **/ \r
 typedef\r
 EFI_STATUS (EFIAPI *EFI_PEI_FV_GET_INFO)(\r

-       IN CONST        EFI_PEI_FIRMWARE_VOLUME_PPI     *This, \r
-       IN CONST        EFI_PEI_FV_HANDLE                                               FvHandle, \r
-       OUT                     EFI_FV_INFO                                                                     *VolumeInfo\r
+  IN CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
+  IN CONST  EFI_PEI_FV_HANDLE             FvHandle, \r
+  OUT       EFI_FV_INFO                   *VolumeInfo\r

 );\r
 \r
 /**\r
   This service enables PEI modules to discover sections of a given type within a valid file.\r
   \r
 );\r
 \r
 /**\r
   This service enables PEI modules to discover sections of a given type within a valid file.\r
   \r

-  @param This  Points to this instance of the\r
+  @param This   Points to this instance of the\r

                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   \r
                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   \r

-  @param SearchType    A filter to find only sections of this\r
+  @param SearchType   A filter to find only sections of this\r

                       type.\r
   \r
                       type.\r
   \r

-  @param FileHandle    Handle of firmware file in which to\r
+  @param FileHandle   Handle of firmware file in which to\r

                       search.\r
   \r
   @param SectionData  Updated upon  return to point to the\r
                       section found.\r
   \r
                       search.\r
   \r
   @param SectionData  Updated upon  return to point to the\r
                       section found.\r
   \r

-  @retval EFI_SUCCESS          Section was found.\r
+  @retval EFI_SUCCESS     Section was found.\r

   \r
   \r

-  @retval EFI_NOT_FOUND        Section of the specified type was not\r
-                                                                                                       found. SectionData contains NULL.\r
+  @retval EFI_NOT_FOUND   Section of the specified type was not\r
+                          found. SectionData contains NULL.\r

 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_FIND_SECTION) (\r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FV_FIND_SECTION) (\r

-       IN CONST        EFI_PEI_FIRMWARE_VOLUME_PPI     *This,\r
-       IN CONST        EFI_SECTION_TYPE                                                        SearchType,\r
-       IN CONST        EFI_PEI_FILE_HANDLE                                     FileHandle,\r
-       OUT                     VOID                                                                                                    **SectionData\r
+  IN CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN CONST  EFI_SECTION_TYPE              SearchType,\r
+  IN CONST  EFI_PEI_FILE_HANDLE           FileHandle,\r
+  OUT       VOID                          **SectionData\r

 );\r
 \r
 \r
 \r
 /*\r
 );\r
 \r
 \r
 \r
 /*\r

-       This PPI provides functions for accessing a memory-mapped firmware volume of a specific format.\r
+  This PPI provides functions for accessing a memory-mapped firmware volume of a specific format.\r

 \r
 \r

-       @param  ProcessVolume                   Process a firmware volume and create a volume handle.\r
-       @param  FindFileByType                  Find all files of a specific type.\r
-       @param  FindFileByName                  Find the file with a specific name.\r
-       @param  GetFileInfo                             Return the information about a specific file\r
-       @param  GetVolumeInfo                   Return the firmware volume attributes.\r
-       @param  FindSectionByType       Find all sections of a specific type.\r
+  @param  ProcessVolume       Process a firmware volume and create a volume handle.\r
+  @param  FindFileByType      Find all files of a specific type.\r
+  @param  FindFileByName      Find the file with a specific name.\r
+  @param  GetFileInfo         Return the information about a specific file\r
+  @param  GetVolumeInfo       Return the firmware volume attributes.\r
+  @param  FindSectionByType   Find all sections of a specific type.\r

 \r
 **/\r
 struct _EFI_PEI_FIRMWARE_VOLUME_PPI {\r
 \r
 **/\r
 struct _EFI_PEI_FIRMWARE_VOLUME_PPI {\r

-       EFI_PEI_FV_PROCESS_FV                   ProcessVolume;\r
-       EFI_PEI_FV_FIND_FILE_TYPE       FindFileByType;\r
-       EFI_PEI_FV_FIND_FILE_NAME       FindFileByName;\r
-       EFI_PEI_FV_GET_FILE_INFO                GetFileInfo;\r
-       EFI_PEI_FV_GET_INFO                             GetVolumeInfo;\r
-       EFI_PEI_FV_FIND_SECTION                 FindSectionByType;\r
+  EFI_PEI_FV_PROCESS_FV       ProcessVolume;\r
+  EFI_PEI_FV_FIND_FILE_TYPE   FindFileByType;\r
+  EFI_PEI_FV_FIND_FILE_NAME   FindFileByName;\r
+  EFI_PEI_FV_GET_FILE_INFO    GetFileInfo;\r
+  EFI_PEI_FV_GET_INFO         GetVolumeInfo;\r
+  EFI_PEI_FV_FIND_SECTION     FindSectionByType;\r

 } ;\r
 \r
 } ;\r
 \r

-extern EFI_GUID        gEfiPeiFirmwareVolumePpiGuid;\r
+extern EFI_GUID gEfiPeiFirmwareVolumePpiGuid;\r

 \r
 #endif \r
 \r
 #endif \r

diff --git a/MdePkg/Include/Ppi/FirmwareVolumeInfo.h b/MdePkg/Include/Ppi/FirmwareVolumeInfo.h
index 7f8698d07788a00c2bc4c48f91faca281a3baab8..a95addf31514acb3ad613f84800fed1274b2bdc4 100644 (file)
--- a/MdePkg/Include/Ppi/FirmwareVolumeInfo.h
+++ b/MdePkg/Include/Ppi/FirmwareVolumeInfo.h
@@ -26,44 +26,44 @@
 #define EFI_PEI_FIRMWARE_VOLUME_INFO_PPI_GUID \\r
 { 0x49edb1c1, 0xbf21, 0x4761, { 0xbb, 0x12, 0xeb, 0x0, 0x31, 0xaa, 0xbb, 0x39 } }\r
 \r
 #define EFI_PEI_FIRMWARE_VOLUME_INFO_PPI_GUID \\r
 { 0x49edb1c1, 0xbf21, 0x4761, { 0xbb, 0x12, 0xeb, 0x0, 0x31, 0xaa, 0xbb, 0x39 } }\r
 \r

-typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI       EFI_PEI_FIRMWARE_VOLUME_INFO_PPI;\r
+typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI  EFI_PEI_FIRMWARE_VOLUME_INFO_PPI;\r

 \r
 /**\r
 \r
 /**\r

-       This PPI describes the location and format of a firmware volume. \r
-       The FvFormat can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for \r
-       a user-defined format. The      EFI_FIRMWARE_FILE_SYSTEM2_GUID is \r
-       the PI Firmware Volume format.\r
+  This PPI describes the location and format of a firmware volume. \r
+  The FvFormat can be EFI_FIRMWARE_FILE_SYSTEM2_GUID or the GUID for \r
+  a user-defined format. The  EFI_FIRMWARE_FILE_SYSTEM2_GUID is \r
+  the PI Firmware Volume format.\r

 \r
 \r

-       @param  FvFormat                        Unique identifier of the format of the memory-mapped firmware volume.\r
+  @param  FvFormat      Unique identifier of the format of the memory-mapped firmware volume.\r

 \r
 \r

-       @param  FvInfo                  Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to\r
-                                                                                               process the volume. The format of this buffer is \r
-                                                                                               specific to the FvFormat. For memory-mapped firmware volumes, \r
-                                                                                               this typically points to the first byte of the firmware volume.\r
+  @param  FvInfo        Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to\r
+                        process the volume. The format of this buffer is \r
+                        specific to the FvFormat. For memory-mapped firmware volumes, \r
+                        this typically points to the first byte of the firmware volume.\r

 \r
 \r

-       @param  FvInfoSize      Size of the data provided by FvInfo. For memory-mapped firmware volumes,\r
-                                                                                               this is typically the size of the firmware volume.\r
+  @param  FvInfoSize    Size of the data provided by FvInfo. For memory-mapped firmware volumes,\r
+                        this is typically the size of the firmware volume.\r

 \r
 \r

-       @param  ParentFvName    If the firmware volume originally came from a firmware file, \r
-                                                                                               then these point to the parent firmware volume\r
-                                                                                               name and firmware volume file. If it did not originally come\r
-                                                                                               from a firmware file, these should be NULL.\r
+  @param  ParentFvName  If the firmware volume originally came from a firmware file, \r
+                        then these point to the parent firmware volume\r
+                        name and firmware volume file. If it did not originally come\r
+                        from a firmware file, these should be NULL.\r

 \r
 \r

-       @param  ParentFileName  If the firmware volume originally came from a firmware file, \r
-                                                                                               then these point to the parent firmware volume\r
-                                                                                               name and firmware volume file. If it did not originally come\r
-                                                                                               from a firmware file, these should be NULL.\r
+  @param  ParentFileName  If the firmware volume originally came from a firmware file, \r
+                        then these point to the parent firmware volume\r
+                        name and firmware volume file. If it did not originally come\r
+                        from a firmware file, these should be NULL.\r

 \r
 **/\r
 struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {\r
 \r
 **/\r
 struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {\r

-       EFI_GUID        FvFormat;\r
-       VOID                    *FvInfo;\r
-       UINT32          FvInfoSize;\r
-       EFI_GUID        *ParentFvName;\r
-       EFI_GUID        *ParentFileName;\r
+  EFI_GUID  FvFormat;\r
+  VOID      *FvInfo;\r
+  UINT32    FvInfoSize;\r
+  EFI_GUID  *ParentFvName;\r
+  EFI_GUID  *ParentFileName;\r

 };\r
 \r
 };\r
 \r

-extern EFI_GUID        gEfiPeiFirmwareVolumeInfoPpiGuid;\r
+extern EFI_GUID gEfiPeiFirmwareVolumeInfoPpiGuid;\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdePkg/Include/Ppi/GuidedSectionExtraction.h b/MdePkg/Include/Ppi/GuidedSectionExtraction.h
index bf1716e4eb0198d112b5b77d6e438119ad74187a..796f8cede99332e9142c954cccd34d4a5b77aabe 100644 (file)
--- a/MdePkg/Include/Ppi/GuidedSectionExtraction.h
+++ b/MdePkg/Include/Ppi/GuidedSectionExtraction.h
@@ -1,8 +1,8 @@
 /* @file\r
   If a GUID-defined section is encountered when doing section extraction, \r
 /* @file\r
   If a GUID-defined section is encountered when doing section extraction, \r

-       the PEI Foundation or the EFI_PEI_FILE_LOADER_PPI instance \r
-       calls the appropriate instance of the GUIDed Section Extraction PPI \r
-       to extract the section stream contained therein.. \r
+  the PEI Foundation or the EFI_PEI_FILE_LOADER_PPI instance \r
+  calls the appropriate instance of the GUIDed Section Extraction PPI \r
+  to extract the section stream contained therein.. \r

 \r
   Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
 \r
   Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r


@@ -37,40 +37,40 @@
 //\r
 \r
 \r
 //\r
 \r
 \r

-typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI;\r
+typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI   EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI;\r

 \r
 //\r
 // Bit values for AuthenticationStatus\r
 //\r
 \r
 //\r
 // Bit values for AuthenticationStatus\r
 //\r

-#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE      0x01\r
-#define EFI_AUTH_STATUS_IMAGE_SIGNED                           0x02\r
-#define EFI_AUTH_STATUS_NOT_TESTED                                     0x04\r
-#define EFI_AUTH_STATUS_TEST_FAILED                            0x08\r
+#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01\r
+#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02\r
+#define EFI_AUTH_STATUS_NOT_TESTED          0x04\r
+#define EFI_AUTH_STATUS_TEST_FAILED         0x08\r

 \r
 /**\r
   The ExtractSection() function processes the input section and\r
 \r
 /**\r
   The ExtractSection() function processes the input section and\r

-       returns a pointer to the section contents. If the section being\r
+  returns a pointer to the section contents. If the section being\r

   extracted does not require processing (if the section\r
   extracted does not require processing (if the section\r

-       GuidedSectionHeader.Attributes has the\r
-       EFI_GUIDED_SECTION_PROCESSING_REQUIRED field cleared), then\r
-       OutputBuffer is just updated to point to the start of the\r
+  GuidedSectionHeader.Attributes has the\r
+  EFI_GUIDED_SECTION_PROCESSING_REQUIRED field cleared), then\r
+  OutputBuffer is just updated to point to the start of the\r

   section's contents. Otherwise, *Buffer must be allocated\r
   from PEI permanent memory.\r
 \r
   section's contents. Otherwise, *Buffer must be allocated\r
   from PEI permanent memory.\r
 \r

-  @param This                                                                  Indicates the\r
-                                                                                                                               EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI instance.\r
-                                                                                                                               Buffer containing the input GUIDed section to be\r
-                                                                                                                               processed. OutputBuffer OutputBuffer is\r
-                                                                                                                               allocated from PEI permanent memory and contains\r
-                                                                                                                               the new section stream.\r
+  @param This                   Indicates the\r
+                                EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI instance.\r
+                                Buffer containing the input GUIDed section to be\r
+                                processed. OutputBuffer OutputBuffer is\r
+                                allocated from PEI permanent memory and contains\r
+                                the new section stream.\r

   \r
   \r

-  @param OutputSize                                            A pointer to a caller-allocated\r
-                                                                                                                               UINTN in which the size of *OutputBuffer\r
-                                                                                                                               allocation is stored. If the function\r
-                                                                                                                               returns anything other than EFI_SUCCESS,\r
-                                                                                                                               the value of OutputSize is undefined.\r
+  @param OutputSize             A pointer to a caller-allocated\r
+                                UINTN in which the size of *OutputBuffer\r
+                                allocation is stored. If the function\r
+                                returns anything other than EFI_SUCCESS,\r
+                                the value of OutputSize is undefined.\r

   \r
   \r

-  @param AuthenticationStatus  A pointer to a caller-allocated\r
+  @param AuthenticationStatus   A pointer to a caller-allocated\r

                                 UINT32 that indicates the\r
                                 authentication status of the\r
                                 output buffer. If the input\r
                                 UINT32 that indicates the\r
                                 authentication status of the\r
                                 output buffer. If the input\r


@@ -87,11 +87,11 @@ typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI       EFI_PEI_GUIDED_SECTION_EX
                                 AuthenticationStatus is\r
                                 undefined.\r
   \r
                                 AuthenticationStatus is\r
                                 undefined.\r
   \r

-  @retval EFI_SUCCESS                                  The InputSection was\r
+  @retval EFI_SUCCESS           The InputSection was\r

                                 successfully processed and the\r
                                 section contents were returned.\r
   \r
                                 successfully processed and the\r
                                 section contents were returned.\r
   \r

-  @retval EFI_OUT_OF_RESOURCES         The system has insufficient\r
+  @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r

                                 resources to process the request.\r
   \r
   @reteval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 resources to process the request.\r
   \r
   @reteval EFI_INVALID_PARAMETER The GUID in InputSection does\r


@@ -101,11 +101,11 @@ typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI     EFI_PEI_GUIDED_SECTION_EX
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_EXTRACT_GUIDED_SECTION)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_EXTRACT_GUIDED_SECTION)(\r

-       IN CONST        EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI *This,\r
-       IN CONST        VOID                                                                                                                                    *InputSection,\r
-       OUT                     VOID                                                                                                                                    **OutputBuffer,\r
-       OUT                     UINTN                                                                                                                           *OutputSize,\r
-       OUT                     UINT32                                                                                                                          *AuthenticationStatus\r
+  IN CONST  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI *This,\r
+  IN CONST  VOID                                  *InputSection,\r
+  OUT       VOID                                  **OutputBuffer,\r
+  OUT       UINTN                                 *OutputSize,\r
+  OUT       UINT32                                *AuthenticationStatus\r

 );\r
 \r
 \r
 );\r
 \r
 \r


@@ -118,14 +118,14 @@ EFI_STATUS
   therein.\r
   \r
   \r
   therein.\r
   \r
   \r

-  @param ExtractSection        Takes the GUIDed section as input and\r
+  @param ExtractSection   Takes the GUIDed section as input and\r

                           produces the section stream data. See\r
                           the ExtractSection() function\r
                           description.\r
   \r
 **/\r
 struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {\r
                           produces the section stream data. See\r
                           the ExtractSection() function\r
                           description.\r
   \r
 **/\r
 struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {\r

-       EFI_PEI_EXTRACT_GUIDED_SECTION ExtractSection;\r
+  EFI_PEI_EXTRACT_GUIDED_SECTION ExtractSection;\r

 };\r
 \r
 \r
 };\r
 \r
 \r

diff --git a/MdePkg/Include/Ppi/LoadFile.h b/MdePkg/Include/Ppi/LoadFile.h
index 041722166518a8b858e8a8629c2cbe6a2ad572bc..2d00ae6278ccb299f0da7316bac0bdf2e54a9872 100644 (file)
--- a/MdePkg/Include/Ppi/LoadFile.h
+++ b/MdePkg/Include/Ppi/LoadFile.h
@@ -21,32 +21,32 @@
 #define __FV_FILE_LOADER_PPI_H__\r
 \r
 #define EFI_PEI_LOAD_FILE_PPI_GUID \\r
 #define __FV_FILE_LOADER_PPI_H__\r
 \r
 #define EFI_PEI_LOAD_FILE_PPI_GUID \\r

-       { 0xb9e0abfe, 0x5979, 0x4914, { 0x97, 0x7f, 0x6d, 0xee, 0x78, 0xc2, 0x78, 0xa6 } }\r
+  { 0xb9e0abfe, 0x5979, 0x4914, { 0x97, 0x7f, 0x6d, 0xee, 0x78, 0xc2, 0x78, 0xa6 } }\r

 \r
 \r
 \r
 \r

-typedef struct _EFI_PEI_LOAD_FILE_PPI  EFI_PEI_LOAD_FILE_PPI;\r
+typedef struct _EFI_PEI_LOAD_FILE_PPI EFI_PEI_LOAD_FILE_PPI;\r

 \r
 /**\r
   This service is the single member function of EFI_LOAD_FILE_PPI. This service separates\r
   image loading and relocating from the PEI Foundation.\r
   \r
 \r
 /**\r
   This service is the single member function of EFI_LOAD_FILE_PPI. This service separates\r
   image loading and relocating from the PEI Foundation.\r
   \r

-  @param This                                                          Interface pointer that implements\r
+  @param This                 Interface pointer that implements\r

                               the Load File PPI instance.\r
 \r
                               the Load File PPI instance.\r
 \r

-  @param FileHandle                                            File handle of the file to load.\r
-                                                                                                                       Type EFI_PEI_FILE_HANDLE is defined in\r
-                                                                                                                       FfsFindNextFile().\r
+  @param FileHandle           File handle of the file to load.\r
+                              Type EFI_PEI_FILE_HANDLE is defined in\r
+                              FfsFindNextFile().\r

 \r
 \r

-  @param ImageAddress                          Pointer to the address of the\r
-                                                                                                                       loaded image.\r
+  @param ImageAddress         Pointer to the address of the\r
+                              loaded image.\r

 \r
 \r

-  @param ImageSize                                             Pointer to the size of the loaded\r
+  @param ImageSize            Pointer to the size of the loaded\r

                               image.\r
 \r
                               image.\r
 \r

-  @param EntryPoint                                    Pointer to the entry point of the\r
+  @param EntryPoint           Pointer to the entry point of the\r

                               image.\r
 \r
                               image.\r
 \r

-  @param AuthenticationState   On exit, points to the attestation\r
+  @param AuthenticationState  On exit, points to the attestation\r

                               authentication state of the image\r
                               or 0 if no attestation was\r
                               performed. The format of\r
                               authentication state of the image\r
                               or 0 if no attestation was\r
                               performed. The format of\r


@@ -54,29 +54,29 @@ typedef struct _EFI_PEI_LOAD_FILE_PPI       EFI_PEI_LOAD_FILE_PPI;
                               EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI.ExtractSection()\r
 \r
 \r
                               EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI.ExtractSection()\r
 \r
 \r

-  @retval EFI_SUCCESS                          The image was loaded successfully.\r
+  @retval EFI_SUCCESS         The image was loaded successfully.\r

 \r
 \r

-  @retval EFI_OUT_OF_RESOURCES         There was not enough memory.\r
+  @retval EFI_OUT_OF_RESOURCES  There was not enough memory.\r

 \r
 \r

-  @retval EFI_LOAD_ERROR                       There was no supported image in\r
+  @retval EFI_LOAD_ERROR      There was no supported image in\r

                               the file EFI_INVALID_PARAMETER\r
                               FileHandle was not a valid\r
                               firmware file handle.\r
                               the file EFI_INVALID_PARAMETER\r
                               FileHandle was not a valid\r
                               firmware file handle.\r

-  @retval EFI_INVALID_PARAMETER        EntryPoint was NULL.\r
+  @retval EFI_INVALID_PARAMETER   EntryPoint was NULL.\r

 \r
 \r

-  @retval EFI_NOT_SUPPORTED    An image requires relocations or\r
-                                                                                                                       is not memory mapped.\r
+  @retval EFI_NOT_SUPPORTED   An image requires relocations or\r
+                              is not memory mapped.\r

    \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_LOAD_FILE) (\r
    \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_LOAD_FILE) (\r

-       IN CONST        EFI_PEI_LOAD_FILE_PPI   *This,\r
-       IN CONST        EFI_PEI_FILE_HANDLE             FileHandle,\r
-       OUT                     EFI_PHYSICAL_ADDRESS            *ImageAddress,\r
-       OUT                     UINT64                                                                  *ImageSize,\r
-       OUT                     EFI_PHYSICAL_ADDRESS            *EntryPoint,\r
-       OUT                     UINT32                                                                  *AuthenticationState\r
+  IN CONST  EFI_PEI_LOAD_FILE_PPI   *This,\r
+  IN CONST  EFI_PEI_FILE_HANDLE     FileHandle,\r
+  OUT       EFI_PHYSICAL_ADDRESS    *ImageAddress,\r
+  OUT       UINT64                  *ImageSize,\r
+  OUT       EFI_PHYSICAL_ADDRESS    *EntryPoint,\r
+  OUT       UINT32                  *AuthenticationState\r

 );\r
 \r
 \r
 );\r
 \r
 \r


@@ -92,7 +92,7 @@ EFI_STATUS
   \r
 **/\r
 struct _EFI_PEI_LOAD_FILE_PPI {\r
   \r
 **/\r
 struct _EFI_PEI_LOAD_FILE_PPI {\r

-       EFI_PEI_LOAD_FILE LoadFile;\r
+  EFI_PEI_LOAD_FILE LoadFile;\r

 };\r
 \r
 \r
 };\r
 \r
 \r

diff --git a/MdePkg/Include/Ppi/LoadImage.h b/MdePkg/Include/Ppi/LoadImage.h
index 40fc7ea289bef1f97240511c2e9ad2373470b0d9..eef7bae32cced0b54f254d2daa9ca099e4be1c50 100644 (file)
--- a/MdePkg/Include/Ppi/LoadImage.h
+++ b/MdePkg/Include/Ppi/LoadImage.h
@@ -1,6 +1,6 @@
 /* @file\r
   The file descript the PPI which notifies other drivers \r
 /* @file\r
   The file descript the PPI which notifies other drivers \r

-       of the PEIM being initialized by the PEI Dispatcher.\r
+  of the PEIM being initialized by the PEI Dispatcher.\r

 \r
   Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
 \r
   Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r


@@ -23,28 +23,28 @@
 #define __LOADED_IMAGE_PPI_H__\r
 \r
 #define EFI_PEI_LOADED_IMAGE_PPI_GUID \\r
 #define __LOADED_IMAGE_PPI_H__\r
 \r
 #define EFI_PEI_LOADED_IMAGE_PPI_GUID \\r

-       { 0xc1fcd448, 0x6300, 0x4458, { 0xb8, 0x64, 0x28, 0xdf, 0x1, 0x53, 0x64, 0xbc } }\r
+  { 0xc1fcd448, 0x6300, 0x4458, { 0xb8, 0x64, 0x28, 0xdf, 0x1, 0x53, 0x64, 0xbc } }\r

 \r
 \r
 \r
 \r

-typedef struct _EFI_PEI_LOADED_IMAGE_PPI       EFI_PEI_LOADED_IMAGE_PPI;\r
+typedef struct _EFI_PEI_LOADED_IMAGE_PPI  EFI_PEI_LOADED_IMAGE_PPI;\r

 \r
 /*\r
 \r
 /*\r

-       This interface is installed by the PEI Dispatcher after the image has been\r
-       loaded and after all security checks have been performed, \r
-       to notify other PEIMs of the files which are being loaded.\r
+  This interface is installed by the PEI Dispatcher after the image has been\r
+  loaded and after all security checks have been performed, \r
+  to notify other PEIMs of the files which are being loaded.\r

 \r
   @param  ImageAddress  Address of the image at the address where it will be executed.\r
 \r
   @param  ImageSize     Size of the image as it will be executed.\r
 \r
 \r
   @param  ImageAddress  Address of the image at the address where it will be executed.\r
 \r
   @param  ImageSize     Size of the image as it will be executed.\r
 \r

-  @param  FileHandle           File handle from which the image was loaded. Can be NULL, \r
-                                                                                               indicating the image was not loaded from a handle.\r
+  @param  FileHandle    File handle from which the image was loaded. Can be NULL, \r
+                        indicating the image was not loaded from a handle.\r

 \r
 **/\r
 struct _EFI_PEI_LOADED_IMAGE_PPI {\r
 \r
 **/\r
 struct _EFI_PEI_LOADED_IMAGE_PPI {\r

-       EFI_PHYSICAL_ADDRESS    ImageAddress;\r
-       UINT64                                                          ImageSize;\r
-       EFI_PEI_FILE_HANDLE     FileHandle;\r
+  EFI_PHYSICAL_ADDRESS  ImageAddress;\r
+  UINT64                ImageSize;\r
+  EFI_PEI_FILE_HANDLE   FileHandle;\r

 };\r
 \r
 \r
 };\r
 \r
 \r

diff --git a/MdePkg/Include/Ppi/PciCfg2.h b/MdePkg/Include/Ppi/PciCfg2.h
index c778e69a49c6e0963796a791ae60793e5f73dc37..ed3ba80231a10cf1697c4ba0d6bd393a4d2d6aca 100644 (file)
--- a/MdePkg/Include/Ppi/PciCfg2.h
+++ b/MdePkg/Include/Ppi/PciCfg2.h
@@ -83,10 +83,10 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_PCI_CFG_PPI_IO) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_PCI_CFG_PPI_IO) (\r

-  IN CONST     EFI_PEI_SERVICES          **PeiServices,\r
-  IN CONST     EFI_PEI_PCI_CFG2_PPI      *This,\r
-  IN CONST     EFI_PEI_PCI_CFG_PPI_WIDTH Width,\r
-  IN CONST     UINT64                    Address,\r
+  IN CONST  EFI_PEI_SERVICES          **PeiServices,\r
+  IN CONST  EFI_PEI_PCI_CFG2_PPI      *This,\r
+  IN CONST  EFI_PEI_PCI_CFG_PPI_WIDTH Width,\r
+  IN CONST  UINT64                    Address,\r

   IN OUT    VOID                      *Buffer\r
 );\r
 \r
   IN OUT    VOID                      *Buffer\r
 );\r
 \r

diff --git a/MdePkg/Include/Ppi/ReadOnlyVariable2.h b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
index fb76ce29847cecfc86a72afc1f0a37696f8ebef4..fc7bf8eec86157e23b0c164b222cb9f3c6bd50a1 100644 (file)
--- a/MdePkg/Include/Ppi/ReadOnlyVariable2.h
+++ b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
@@ -22,31 +22,31 @@
 #define __PEI_READ_ONLY_VARIABLE2_PPI_H__\r
 \r
 #define EFI_PEI_READ_ONLY_VARIABLE2_PPI_GUID \\r
 #define __PEI_READ_ONLY_VARIABLE2_PPI_H__\r
 \r
 #define EFI_PEI_READ_ONLY_VARIABLE2_PPI_GUID \\r

-       { 0x2ab86ef5, 0xecb5, 0x4134, { 0xb5, 0x56, 0x38, 0x54, 0xca, 0x1f, 0xe1, 0xb4 } }\r
+  { 0x2ab86ef5, 0xecb5, 0x4134, { 0xb5, 0x56, 0x38, 0x54, 0xca, 0x1f, 0xe1, 0xb4 } }\r

 \r
 \r
 typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI  EFI_PEI_READ_ONLY_VARIABLE2_PPI;\r
 \r
 /**\r
   Read the specified variable from the UEFI variable store. If the Data \r
 \r
 \r
 typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI  EFI_PEI_READ_ONLY_VARIABLE2_PPI;\r
 \r
 /**\r
   Read the specified variable from the UEFI variable store. If the Data \r

-       buffer is too small to hold the contents of the variable, \r
-       the error EFI_BUFFER_TOO_SMALL is returned and DataSize is set to the\r
-       required buffer size to obtain the data.\r
+  buffer is too small to hold the contents of the variable, \r
+  the error EFI_BUFFER_TOO_SMALL is returned and DataSize is set to the\r
+  required buffer size to obtain the data.\r

 \r
 \r

-  @param  This                                 A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.\r
+  @param  This            A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.\r

 \r
 \r

-  @param  VariableName         A pointer to a null-terminated string that is the variable¡¯s name.\r
+  @param  VariableName    A pointer to a null-terminated string that is the variable¡¯s name.\r

 \r
 \r

-  @param  VendorGuid           A pointer to an EFI_GUID that is the variable¡¯s GUID. The combination of\r
-                                                                                                       VariableGuid and VariableName must be unique.\r
+  @param  VendorGuid      A pointer to an EFI_GUID that is the variable¡¯s GUID. The combination of\r
+                          VariableGuid and VariableName must be unique.\r

 \r
 \r

-  @param  Attributes           If non-NULL, on return, points to the variable¡¯s attributes. See ¡°Related Definitons¡±\r
-                                                                                                       below for possible attribute values.\r
+  @param  Attributes      If non-NULL, on return, points to the variable¡¯s attributes. See ¡°Related Definitons¡±\r
+                          below for possible attribute values.\r

 \r
 \r

-  @param  DataSize             On entry, points to the size in bytes of the Data buffer. On return, points to the size of\r
-                                                                                                       the data returned in Data.\r
+  @param  DataSize        On entry, points to the size in bytes of the Data buffer. On return, points to the size of\r
+                          the data returned in Data.\r

 \r
 \r

-  @param  Data                 Points to the buffer which will hold the returned variable value.\r
+  @param  Data            Points to the buffer which will hold the returned variable value.\r

 \r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
 \r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r


@@ -54,8 +54,8 @@ typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI  EFI_PEI_READ_ONLY_VARIABLE2_PPI
   @retval EFI_NOT_FOUND         The variable was not found.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data. \r
   @retval EFI_NOT_FOUND         The variable was not found.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data. \r

-                                                                                                                               DataSize is updated with the size required for \r
-                                                                                                                               the specified variable.\r
+                                DataSize is updated with the size required for \r
+                                the specified variable.\r

 \r
   @retval EFI_INVALID_PARAMETER VariableName, VariableGuid, DataSize or Data is NULL.\r
 \r
 \r
   @retval EFI_INVALID_PARAMETER VariableName, VariableGuid, DataSize or Data is NULL.\r
 \r


@@ -65,32 +65,32 @@ typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI  EFI_PEI_READ_ONLY_VARIABLE2_PPI
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_GET_VARIABLE2)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_GET_VARIABLE2)(\r

-       IN CONST        EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,\r
-       IN CONST        CHAR16                                                                                                  *VariableName,\r
-       IN CONST        EFI_GUID                                                                                                *VariableGuid,\r
-       OUT                     UINT32                                                                                                  *Attributes,\r
-       IN OUT          UINTN                                                                                                   *DataSize,\r
-       OUT                     VOID                                                                                                            *Data\r
+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,\r
+  IN CONST  CHAR16                          *VariableName,\r
+  IN CONST  EFI_GUID                        *VariableGuid,\r
+  OUT       UINT32                          *Attributes,\r
+  IN OUT    UINTN                           *DataSize,\r
+  OUT       VOID                            *Data\r

 );\r
 \r
 \r
 /**\r
   This function is called multiple times to retrieve the VariableName \r
 );\r
 \r
 \r
 /**\r
   This function is called multiple times to retrieve the VariableName \r

-       and VariableGuid of all variables currently available in the system. \r
-       On each call, the previous results are passed into the interface, \r
-       and, on return, the interface returns the data for the next \r
-       interface. When the entire variable list has been returned, \r
-       EFI_NOT_FOUND is returned.\r
+  and VariableGuid of all variables currently available in the system. \r
+  On each call, the previous results are passed into the interface, \r
+  and, on return, the interface returns the data for the next \r
+  interface. When the entire variable list has been returned, \r
+  EFI_NOT_FOUND is returned.\r

 \r
 \r

-  @param  This                                 A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.\r
+  @param  This              A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.\r

 \r
 \r

-  @param  VariableNameSize     On entry, points to the size of the buffer pointed to by VariableName.\r
+  @param  VariableNameSize  On entry, points to the size of the buffer pointed to by VariableName.\r

 \r
 \r

-  @param  VariableName         On entry, a pointer to a null-terminated string that is the variable¡¯s name.\r
-                                                                                                               On return, points to the next variable¡¯s null-terminated name string.\r
+  @param  VariableName      On entry, a pointer to a null-terminated string that is the variable¡¯s name.\r
+                            On return, points to the next variable¡¯s null-terminated name string.\r

 \r
 \r

-  @param  VendorGuid           On entry, a pointer to an UEFI _GUID that is the variable¡¯s GUID. \r
-                                                                                                               On return, a pointer to the next variable¡¯s GUID.\r
+  @param  VendorGuid        On entry, a pointer to an UEFI _GUID that is the variable¡¯s GUID. \r
+                            On return, a pointer to the next variable¡¯s GUID.\r

 \r
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r
 \r
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r


@@ -98,11 +98,11 @@ EFI_STATUS
   @retval EFI_NOT_FOUND         The variable could not be found.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL  The VariableNameSize is too small for the resulting\r
   @retval EFI_NOT_FOUND         The variable could not be found.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL  The VariableNameSize is too small for the resulting\r

-                                                                                                                               data. VariableNameSize is updated with the size\r
-                                                                                                                               required for the specified variable.\r
+                                data. VariableNameSize is updated with the size\r
+                                required for the specified variable.\r

 \r
   @retval EFI_INVALID_PARAMETER VariableName, VariableGuid or\r
 \r
   @retval EFI_INVALID_PARAMETER VariableName, VariableGuid or\r

-                                                                                                                               VariableNameSize is NULL.\r
+                                VariableNameSize is NULL.\r

 \r
   @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.\r
 \r
 \r
   @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.\r
 \r


@@ -110,10 +110,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_NEXT_VARIABLE_NAME2) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_NEXT_VARIABLE_NAME2) (\r

-       IN CONST        EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,\r
-       IN OUT          UINTN                                                                                                   *VariableNameSize,\r
-       IN OUT          CHAR16                                                                                                  *VariableName,\r
-       IN OUT          EFI_GUID                                                                                                *VariableGuid\r
+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,\r
+  IN OUT    UINTN                           *VariableNameSize,\r
+  IN OUT    CHAR16                          *VariableName,\r
+  IN OUT    EFI_GUID                        *VariableGuid\r

 );\r
 \r
 /**\r
 );\r
 \r
 /**\r


@@ -128,8 +128,8 @@ EFI_STATUS
 \r
 **/\r
 struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {\r
 \r
 **/\r
 struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {\r

-       EFI_PEI_GET_VARIABLE2                   GetVariable;\r
-       EFI_PEI_NEXT_VARIABLE_NAME2     NextVariableName;\r
+  EFI_PEI_GET_VARIABLE2       GetVariable;\r
+  EFI_PEI_NEXT_VARIABLE_NAME2 NextVariableName;\r

 };\r
 \r
 extern EFI_GUID gEfiPeiReadOnlyVariable2PpiGuid;\r
 };\r
 \r
 extern EFI_GUID gEfiPeiReadOnlyVariable2PpiGuid;\r

diff --git a/MdePkg/Include/Ppi/SecPlatformInformation.h b/MdePkg/Include/Ppi/SecPlatformInformation.h
index ce4dda60b5035c741191e29819935160fd9397d1..da75ad89f2694632dea692d3d3ab3bf2df1b63e9 100644 (file)
--- a/MdePkg/Include/Ppi/SecPlatformInformation.h
+++ b/MdePkg/Include/Ppi/SecPlatformInformation.h
@@ -66,14 +66,14 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SEC_PLATFORM_INFORMATION) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SEC_PLATFORM_INFORMATION) (\r

-       IN CONST        EFI_PEI_SERVICES                                                                                **PeiServices,\r
-       IN OUT          UINT64                                                                                                                  *StructureSize,\r
-       OUT                     EFI_SEC_PLATFORM_INFORMATION_RECORD     *PlatformInformationRecord\r
+  IN CONST  EFI_PEI_SERVICES                    **PeiServices,\r
+  IN OUT    UINT64                              *StructureSize,\r
+  OUT       EFI_SEC_PLATFORM_INFORMATION_RECORD *PlatformInformationRecord\r

 );\r
 \r
 \r
 /**\r
 );\r
 \r
 \r
 /**\r

-       Ppi Description:\r
+  Ppi Description:\r

 \r
   @param Name\r
 \r
 \r
   @param Name\r
 \r

diff --git a/MdePkg/Include/Ppi/Smbus2.h b/MdePkg/Include/Ppi/Smbus2.h
index b5e2631aa2d6ea9722bbed3e879003d8b2186697..42246e10f277706dff73381bdb3460529b058d85 100644 (file)
--- a/MdePkg/Include/Ppi/Smbus2.h
+++ b/MdePkg/Include/Ppi/Smbus2.h
@@ -24,7 +24,7 @@
 #include <IndustryStandard/SmBus.h>\r
 \r
 #define EFI_PEI_SMBUS2_PPI_GUID \\r
 #include <IndustryStandard/SmBus.h>\r
 \r
 #define EFI_PEI_SMBUS2_PPI_GUID \\r

-       { 0x9ca93627, 0xb65b, 0x4324, { 0xa2, 0x2, 0xc0, 0xb4, 0x61, 0x76, 0x45, 0x43 } }\r
+  { 0x9ca93627, 0xb65b, 0x4324, { 0xa2, 0x2, 0xc0, 0xb4, 0x61, 0x76, 0x45, 0x43 } }\r

 \r
 \r
 typedef struct _EFI_PEI_SMBUS2_PPI EFI_PEI_SMBUS2_PPI;\r
 \r
 \r
 typedef struct _EFI_PEI_SMBUS2_PPI EFI_PEI_SMBUS2_PPI;\r


@@ -32,36 +32,36 @@ typedef struct _EFI_PEI_SMBUS2_PPI EFI_PEI_SMBUS2_PPI;
 //\r
 // EFI_SMBUS_DEVICE_COMMAND\r
 //\r
 //\r
 // EFI_SMBUS_DEVICE_COMMAND\r
 //\r

-typedef UINTN  EFI_SMBUS_DEVICE_COMMAND;\r
+typedef UINTN   EFI_SMBUS_DEVICE_COMMAND;\r

 \r
 \r
 /*\r
   Executes an SMBus operation to an SMBus controller.\r
 \r
 \r
 \r
 /*\r
   Executes an SMBus operation to an SMBus controller.\r
 \r

-  @param  This                 A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
-  @param  SlaveAddress         The SMBUS hardware address to which the SMBUS device is preassigned or\r
-                                                                                                       allocated.\r
-  @param  Command              This command is transmitted by the SMBus host controller to the SMBus slave \r
-                                                                                                       device and the interpretation is SMBus slave device specific. \r
-                                                                                                       It can mean the offset to a list of functions inside \r
-                                                                                                       an SMBus slave device. Not all operations or slave devices support\r
-                                                                                                       this command's registers.\r
+  @param  This            A pointer to the EFI_PEI_SMBUS2_PPI instance.\r
+  @param  SlaveAddress    The SMBUS hardware address to which the SMBUS device is preassigned or\r
+                          allocated.\r
+  @param  Command         This command is transmitted by the SMBus host controller to the SMBus slave \r
+                          device and the interpretation is SMBus slave device specific. \r
+                          It can mean the offset to a list of functions inside \r
+                          an SMBus slave device. Not all operations or slave devices support\r
+                          this command's registers.\r

 \r
 \r

-  @param  Operation            Signifies which particular SMBus hardware protocol instance that it \r
-                                                                                                       will use to execute the SMBus transactions. \r
-                                                                                                       This SMBus hardware protocol is defined by the System Management Bus (SMBus) \r
-                                                                                                       Specification and is not related to UEFI.\r
+  @param  Operation       Signifies which particular SMBus hardware protocol instance that it \r
+                          will use to execute the SMBus transactions. \r
+                          This SMBus hardware protocol is defined by the System Management Bus (SMBus) \r
+                          Specification and is not related to UEFI.\r

 \r
 \r

-  @param  PecCheck             Defines if Packet Error Code (PEC) checking is required for this operation.\r
+  @param  PecCheck        Defines if Packet Error Code (PEC) checking is required for this operation.\r

 \r
 \r

-  @param  Length               Signifies the number of bytes that this operation will do. \r
-                                                                                                       The maximum number of bytes can be revision specific and operation specific.\r
-                                                                                                       This parameter will contain the actual number of bytes that are executed\r
-                                                                                                       for this operation. Not all operations require this argument.\r
+  @param  Length          Signifies the number of bytes that this operation will do. \r
+                          The maximum number of bytes can be revision specific and operation specific.\r
+                          This parameter will contain the actual number of bytes that are executed\r
+                          for this operation. Not all operations require this argument.\r

 \r
 \r

-  @param  Buffer               Contains the value of data to execute to the SMBus slave device. \r
-                                                                                                       Not all operations require this argument. \r
-                                                                                                       The length of this buffer is identified by Length.\r
+  @param  Buffer          Contains the value of data to execute to the SMBus slave device. \r
+                          Not all operations require this argument. \r
+                          The length of this buffer is identified by Length.\r

 \r
 \r
   @retval EFI_SUCCESS           The last data that was returned from the access\r
 \r
 \r
   @retval EFI_SUCCESS           The last data that was returned from the access\r


@@ -83,13 +83,13 @@ typedef UINTN       EFI_SMBUS_DEVICE_COMMAND;
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_EXECUTE_OPERATION) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_EXECUTE_OPERATION) (\r

-       IN CONST        EFI_PEI_SMBUS2_PPI                              *This,\r
-       IN CONST        EFI_SMBUS_DEVICE_ADDRESS        SlaveAddress,\r
-       IN CONST        EFI_SMBUS_DEVICE_COMMAND        Command,\r
-       IN CONST        EFI_SMBUS_OPERATION                     Operation,\r
-       IN CONST        BOOLEAN                                                                         PecCheck,\r
-       IN OUT          UINTN                                                                           *Length,\r
-       IN OUT          VOID                                                                                    *Buffer\r
+  IN CONST  EFI_PEI_SMBUS2_PPI        *This,\r
+  IN CONST  EFI_SMBUS_DEVICE_ADDRESS  SlaveAddress,\r
+  IN CONST  EFI_SMBUS_DEVICE_COMMAND  Command,\r
+  IN CONST  EFI_SMBUS_OPERATION       Operation,\r
+  IN CONST  BOOLEAN                   PecCheck,\r
+  IN OUT    UINTN                     *Length,\r
+  IN OUT    VOID                      *Buffer\r

 );\r
 \r
 \r
 );\r
 \r
 \r


@@ -119,9 +119,9 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS_NOTIFY2_FUNCTION) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS_NOTIFY2_FUNCTION) (\r

-       IN CONST        EFI_PEI_SMBUS2_PPI                              *SmbusPpi,\r
-       IN CONST        EFI_SMBUS_DEVICE_ADDRESS        SlaveAddress,\r
-       IN CONST        UINTN                                                                           Data\r
+  IN CONST  EFI_PEI_SMBUS2_PPI        *SmbusPpi,\r
+  IN CONST  EFI_SMBUS_DEVICE_ADDRESS  SlaveAddress,\r
+  IN CONST  UINTN                     Data\r

 );\r
 /**\r
   The ArpDevice() function enumerates the entire bus or enumerates a specific \r
 );\r
 /**\r
   The ArpDevice() function enumerates the entire bus or enumerates a specific \r


@@ -149,10 +149,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_ARP_DEVICE) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_ARP_DEVICE) (\r

-       IN CONST        EFI_PEI_SMBUS2_PPI                              *This,\r
-       IN CONST  BOOLEAN                                                                       ArpAll,\r
-       IN CONST        EFI_SMBUS_UDID                                          *SmbusUdid, OPTIONAL\r
-       IN OUT          EFI_SMBUS_DEVICE_ADDRESS        *SlaveAddress OPTIONAL\r
+  IN CONST  EFI_PEI_SMBUS2_PPI        *This,\r
+  IN CONST  BOOLEAN                   ArpAll,\r
+  IN CONST  EFI_SMBUS_UDID            *SmbusUdid, OPTIONAL\r
+  IN OUT    EFI_SMBUS_DEVICE_ADDRESS  *SlaveAddress OPTIONAL\r

 );\r
 \r
 \r
 );\r
 \r
 \r


@@ -176,9 +176,9 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_GET_ARP_MAP) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_GET_ARP_MAP) (\r

-       IN CONST        EFI_PEI_SMBUS2_PPI              *This,\r
-       IN OUT          UINTN                                                           *Length,\r
-       IN OUT          EFI_SMBUS_DEVICE_MAP    **SmbusDeviceMap\r
+  IN CONST  EFI_PEI_SMBUS2_PPI    *This,\r
+  IN OUT    UINTN                 *Length,\r
+  IN OUT    EFI_SMBUS_DEVICE_MAP  **SmbusDeviceMap\r

 );\r
 \r
 \r
 );\r
 \r
 \r


@@ -201,10 +201,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_NOTIFY) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_SMBUS2_PPI_NOTIFY) (\r

-       IN CONST        EFI_PEI_SMBUS2_PPI                                                      *This,\r
-       IN CONST        EFI_SMBUS_DEVICE_ADDRESS                                SlaveAddress,\r
-       IN CONST        UINTN                                                                                                   Data,\r
-       IN CONST        EFI_PEI_SMBUS_NOTIFY2_FUNCTION  NotifyFunction\r
+  IN CONST  EFI_PEI_SMBUS2_PPI              *This,\r
+  IN CONST  EFI_SMBUS_DEVICE_ADDRESS        SlaveAddress,\r
+  IN CONST  UINTN                           Data,\r
+  IN CONST  EFI_PEI_SMBUS_NOTIFY2_FUNCTION  NotifyFunction\r

 );\r
 \r
 /**\r
 );\r
 \r
 /**\r


@@ -231,11 +231,11 @@ EFI_STATUS
 \r
 **/\r
 struct _EFI_PEI_SMBUS2_PPI {\r
 \r
 **/\r
 struct _EFI_PEI_SMBUS2_PPI {\r

-       EFI_PEI_SMBUS2_PPI_EXECUTE_OPERATION    Execute;\r
-       EFI_PEI_SMBUS2_PPI_ARP_DEVICE                           ArpDevice;\r
-       EFI_PEI_SMBUS2_PPI_GET_ARP_MAP                          GetArpMap;\r
-       EFI_PEI_SMBUS2_PPI_NOTIFY                                               Notify;\r
-       EFI_GUID                                                                                                                        Identifier;\r
+  EFI_PEI_SMBUS2_PPI_EXECUTE_OPERATION  Execute;\r
+  EFI_PEI_SMBUS2_PPI_ARP_DEVICE         ArpDevice;\r
+  EFI_PEI_SMBUS2_PPI_GET_ARP_MAP        GetArpMap;\r
+  EFI_PEI_SMBUS2_PPI_NOTIFY             Notify;\r
+  EFI_GUID                              Identifier;\r

 };\r
 \r
 extern EFI_GUID gEfiPeiSmbus2PpiGuid;\r
 };\r
 \r
 extern EFI_GUID gEfiPeiSmbus2PpiGuid;\r

diff --git a/MdePkg/Include/Ppi/Stall.h b/MdePkg/Include/Ppi/Stall.h
index b608f3af116ffc573b702fc5a38afa2e1bbe850e..5f190e3b65897a2fa862bd793ab3f849946c5afa 100644 (file)
--- a/MdePkg/Include/Ppi/Stall.h
+++ b/MdePkg/Include/Ppi/Stall.h
@@ -24,7 +24,7 @@
 #define __STALL_PPI_H__\r
 \r
 #define EFI_PEI_STALL_PPI_GUID \\r
 #define __STALL_PPI_H__\r
 \r
 #define EFI_PEI_STALL_PPI_GUID \\r

-       { 0x1f4c6f90, 0xb06b, 0x48d8, {0xa2, 0x01, 0xba, 0xe5, 0xf1, 0xcd, 0x7d, 0x56 } }\r
+  { 0x1f4c6f90, 0xb06b, 0x48d8, {0xa2, 0x01, 0xba, 0xe5, 0xf1, 0xcd, 0x7d, 0x56 } }\r

 \r
 typedef struct _EFI_PEI_STALL_PPI EFI_PEI_STALL_PPI;\r
 \r
 \r
 typedef struct _EFI_PEI_STALL_PPI EFI_PEI_STALL_PPI;\r
 \r

diff --git a/MdePkg/Include/Ppi/TemporaryRamSupport.h b/MdePkg/Include/Ppi/TemporaryRamSupport.h
index 9ecf505aec8d31d907c1adeb1598bbc69a8e5988..97ff7ede821ba016b746cfa3d859ab9f8d1d39da 100644 (file)
--- a/MdePkg/Include/Ppi/TemporaryRamSupport.h
+++ b/MdePkg/Include/Ppi/TemporaryRamSupport.h
@@ -22,44 +22,44 @@
 #define __TEMPORARY_RAM_SUPPORT_H__\r
 \r
 #define TEMPORARY_RAM_SUPPORT_PPI_GUID \\r
 #define __TEMPORARY_RAM_SUPPORT_H__\r
 \r
 #define TEMPORARY_RAM_SUPPORT_PPI_GUID \\r

-       { 0xdbe23aa9, 0xa345, 0x4b97, {0x85, 0xb6, 0xb2, 0x26, 0xf1, 0x61, 0x73, 0x89} }\r
+  { 0xdbe23aa9, 0xa345, 0x4b97, {0x85, 0xb6, 0xb2, 0x26, 0xf1, 0x61, 0x73, 0x89} }\r

 \r
 \r
 /*\r
   This service of the TEMPORARY_RAM_SUPPORT_PPI that migrates temporary RAM into\r
 \r
 \r
 /*\r
   This service of the TEMPORARY_RAM_SUPPORT_PPI that migrates temporary RAM into\r

-       permanent memory.\r
+  permanent memory.\r

 \r
 \r

-  @param PeiServices                                           Pointer to the PEI Services Table.\r
+  @param PeiServices            Pointer to the PEI Services Table.\r

 \r
 \r

-  @param TemporaryMemoryBase           Source Address in temporary memory from which the SEC or PEIM will copy the\r
-                                                                                                                               Temporary RAM contents.\r
+  @param TemporaryMemoryBase    Source Address in temporary memory from which the SEC or PEIM will copy the\r
+                                Temporary RAM contents.\r

 \r
 \r

-  @param PermanentMemoryBase           Destination Address in permanent memory into which the SEC or PEIM will copy the\r
-                                                                                                                               Temporary RAM contents.\r
+  @param PermanentMemoryBase    Destination Address in permanent memory into which the SEC or PEIM will copy the\r
+                                Temporary RAM contents.\r

 \r
 \r

-  @param CopySize                                                              Amount of memory to migrate from temporary to permanent memory.\r
+  @param CopySize               Amount of memory to migrate from temporary to permanent memory.\r

 \r
 \r
 \r
 \r
 \r
 \r

-       @retval EFI_SUCCESS                                             The data was successfully returned.\r
+  @retval EFI_SUCCESS           The data was successfully returned.\r

 \r
 \r

-       @retval EFI_INVALID_PARAMETER PermanentMemoryBase + CopySize >\r
-                                                                                                                               TemporaryMemoryBase when TemporaryMemoryBase >\r
-                                                                                                                               PermanentMemoryBase.\r
+  @retval EFI_INVALID_PARAMETER PermanentMemoryBase + CopySize >\r
+                                TemporaryMemoryBase when TemporaryMemoryBase >\r
+                                PermanentMemoryBase.\r

 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI * TEMPORARY_RAM_MIGRATION) (\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI * TEMPORARY_RAM_MIGRATION) (\r

-       IN CONST EFI_PEI_SERVICES       **PeiServices,\r
-       IN EFI_PHYSICAL_ADDRESS                 TemporaryMemoryBase,\r
-       IN EFI_PHYSICAL_ADDRESS                 PermanentMemoryBase,\r
-       IN UINTN                                                                                CopySize\r
+  IN CONST EFI_PEI_SERVICES   **PeiServices,\r
+  IN EFI_PHYSICAL_ADDRESS     TemporaryMemoryBase,\r
+  IN EFI_PHYSICAL_ADDRESS     PermanentMemoryBase,\r
+  IN UINTN                    CopySize\r

 );\r
 \r
 \r
 typedef struct {\r
 );\r
 \r
 \r
 typedef struct {\r

-       TEMPORARY_RAM_MIGRATION         TemporaryRamMigration;\r
+  TEMPORARY_RAM_MIGRATION   TemporaryRamMigration;\r

 } TEMPORARY_RAM_SUPPORT_PPI;\r
 \r
 extern EFI_GUID gEfiPeiTemporaryRamSupportPpiGuid;\r
 } TEMPORARY_RAM_SUPPORT_PPI;\r
 \r
 extern EFI_GUID gEfiPeiTemporaryRamSupportPpiGuid;\r

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index e0e25e155a2f7d4ea4bf5f2115cc8f9b3c279eb2..429cbdcf1dcbba1f3d4071769f43faa485a32cb2 100644 (file)
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -22,23 +22,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Basical data type definitions introduced in UEFI.\r
 // \r
 //\r
 // Basical data type definitions introduced in UEFI.\r
 // \r

-typedef GUID                                                   EFI_GUID;\r
-typedef RETURN_STATUS                                          EFI_STATUS;\r
-typedef VOID                                                                                   *EFI_HANDLE;\r
+typedef GUID                      EFI_GUID;\r
+typedef RETURN_STATUS             EFI_STATUS;\r
+typedef VOID                      *EFI_HANDLE;\r

 \r
 \r

-typedef VOID                                                                           *EFI_EVENT;\r
+typedef VOID                      *EFI_EVENT;\r

 \r
 \r

-typedef UINTN                                                                          EFI_TPL;\r
+typedef UINTN                     EFI_TPL;\r

 \r
 \r
 \r
 \r

-typedef UINT64                                                                 EFI_LBA;\r
+typedef UINT64                    EFI_LBA;\r

 \r
 \r
 \r
 \r

-typedef UINT16                                                                         EFI_HII_HANDLE;\r
-typedef UINT16                                                                         STRING_REF;\r
+typedef UINT16                    EFI_HII_HANDLE;\r
+typedef UINT16                    STRING_REF;\r

 \r
 \r

-typedef UINT64                                                                         EFI_PHYSICAL_ADDRESS;\r
-typedef UINT64                                                                         EFI_VIRTUAL_ADDRESS;\r
+typedef UINT64                    EFI_PHYSICAL_ADDRESS;\r
+typedef UINT64                    EFI_VIRTUAL_ADDRESS;\r

 \r
 //\r
 // EFI Time Abstraction:\r
 \r
 //\r
 // EFI Time Abstraction:\r


@@ -105,12 +105,12 @@ typedef struct {
 #define EFI_WARN_BUFFER_TOO_SMALL RETURN_WARN_BUFFER_TOO_SMALL\r
 \r
 \r
 #define EFI_WARN_BUFFER_TOO_SMALL RETURN_WARN_BUFFER_TOO_SMALL\r
 \r
 \r

-#define NULL_HANDLE                                                    ((VOID *) 0)\r
+#define NULL_HANDLE               ((VOID *) 0)\r

 \r
 //\r
 // Define macro to encode the status code.\r
 // \r
 \r
 //\r
 // Define macro to encode the status code.\r
 // \r

-#define EFIERR(_a)                                             ENCODE_ERROR(_a)\r
+#define EFIERR(_a)                ENCODE_ERROR(_a)\r

 \r
 #define EFI_ERROR(A)              RETURN_ERROR(A)\r
 \r
 \r
 #define EFI_ERROR(A)              RETURN_ERROR(A)\r
 \r


@@ -133,9 +133,9 @@ typedef struct {
 // 4K. This should in no way be confused with the page size of the processor.\r
 // An EFI_PAGE is just the quanta of memory in EFI.\r
 //\r
 // 4K. This should in no way be confused with the page size of the processor.\r
 // An EFI_PAGE is just the quanta of memory in EFI.\r
 //\r

-#define EFI_PAGE_SIZE                                                  0x1000\r
-#define EFI_PAGE_MASK                  0xFFF\r
-#define EFI_PAGE_SHIFT                 12\r
+#define EFI_PAGE_SIZE             0x1000\r
+#define EFI_PAGE_MASK             0xFFF\r
+#define EFI_PAGE_SHIFT            12\r

 \r
 \r
 #endif\r
 \r
 \r
 #endif\r

diff --git a/MdePkg/Include/Uefi/UefiDevicePath.h b/MdePkg/Include/Uefi/UefiDevicePath.h
index de5dbf71247ac07de9b5cc52ece8ed42f714388f..3d27e92420687cbc70b1e1703bb3ec108f8b63a3 100644 (file)
--- a/MdePkg/Include/Uefi/UefiDevicePath.h
+++ b/MdePkg/Include/Uefi/UefiDevicePath.h
@@ -180,12 +180,12 @@ typedef struct {
     UINT8                         Lun;\r
 } DEVICE_LOGICAL_UNIT_DEVICE_PATH;\r
 \r
     UINT8                         Lun;\r
 } DEVICE_LOGICAL_UNIT_DEVICE_PATH;\r
 \r

-#define MSG_SATA_DP                                                            0x12\r
+#define MSG_SATA_DP               0x12\r

 typedef struct {\r
 typedef struct {\r

-       EFI_DEVICE_PATH_PROTOCOL        Header;\r
-       UINT16                                                                                                  HbaPortNumber;\r
-       UINT16                          PortMultiplierPort;\r
-       UINT16                          LogicalUnitNumber;\r
+  EFI_DEVICE_PATH_PROTOCOL        Header;\r
+  UINT16                          HbaPortNumber;\r
+  UINT16                          PortMultiplierPort;\r
+  UINT16                          LogicalUnitNumber;\r

 } SATA_DEVICE_PATH;\r
 \r
 #define MSG_I2O_DP                0x06\r
 } SATA_DEVICE_PATH;\r
 \r
 #define MSG_I2O_DP                0x06\r


@@ -253,7 +253,7 @@ typedef struct {
 // Use VENDOR_DEVICE_PATH struct\r
 //\r
 #define MSG_VENDOR_DP             0x0a\r
 // Use VENDOR_DEVICE_PATH struct\r
 //\r
 #define MSG_VENDOR_DP             0x0a\r

-typedef VENDOR_DEVICE_PATH                             VENDOR_DEFINED_DEVICE_PATH;\r
+typedef VENDOR_DEVICE_PATH        VENDOR_DEFINED_DEVICE_PATH;\r

 \r
 #define DEVICE_PATH_MESSAGING_PC_ANSI     EFI_PC_ANSI_GUID\r
 #define DEVICE_PATH_MESSAGING_VT_100      EFI_VT_100_GUID\r
 \r
 #define DEVICE_PATH_MESSAGING_PC_ANSI     EFI_PC_ANSI_GUID\r
 #define DEVICE_PATH_MESSAGING_VT_100      EFI_VT_100_GUID\r


@@ -350,11 +350,11 @@ typedef struct {
 } MEDIA_PROTOCOL_DEVICE_PATH;\r
 \r
 \r
 } MEDIA_PROTOCOL_DEVICE_PATH;\r
 \r
 \r

-#define MEDIA_PIWG_FW_VOL_DP                   0x6\r
+#define MEDIA_PIWG_FW_VOL_DP      0x6\r

 typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
 \r
 \r
 typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
 \r
 \r

-#define MEDIA_PIWG_FW_FILE_DP                  0x7\r
+#define MEDIA_PIWG_FW_FILE_DP     0x7\r

 typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_DEVICE_PATH;\r
 \r
 //\r
 typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_DEVICE_PATH;\r
 \r
 //\r

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index 9f9c71949460e7d7a49ebc65fe3df5c7cf8bc87c..ae46db9ac178b57ea52361c65ead0eacc137db53 100644 (file)
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-       This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
+  This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r

 \r
 \r

-       Copyright (c) 2006, Intel Corporation                                                         \r
-       All rights reserved. This program and the accompanying materials                          \r
-       are licensed and made available under the terms and conditions of the BSD License         \r
-       which accompanies this distribution.  The full text of the license may be found at        \r
-       http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006, Intel Corporation                                                         \r
+  All rights reserved. This program and the accompanying materials                          \r
+  are licensed and made available under the terms and conditions of the BSD License         \r
+  which accompanies this distribution.  The full text of the license may be found at        \r
+  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r

 \r
 \r

-       Module Name:  UefiMultiPhase.h\r
+  Module Name:  UefiMultiPhase.h\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -21,21 +21,21 @@
 // Enumeration of memory types introduced in UEFI.\r
 // \r
 typedef enum {\r
 // Enumeration of memory types introduced in UEFI.\r
 // \r
 typedef enum {\r

-       EfiReservedMemoryType,\r
-       EfiLoaderCode,\r
-       EfiLoaderData,\r
-       EfiBootServicesCode,\r
-       EfiBootServicesData,\r
-       EfiRuntimeServicesCode,\r
-       EfiRuntimeServicesData,\r
-       EfiConventionalMemory,\r
-       EfiUnusableMemory,\r
-       EfiACPIReclaimMemory,\r
-       EfiACPIMemoryNVS,\r
-       EfiMemoryMappedIO,\r
-       EfiMemoryMappedIOPortSpace,\r
-       EfiPalCode,\r
-       EfiMaxMemoryType\r
+  EfiReservedMemoryType,\r
+  EfiLoaderCode,\r
+  EfiLoaderData,\r
+  EfiBootServicesCode,\r
+  EfiBootServicesData,\r
+  EfiRuntimeServicesCode,\r
+  EfiRuntimeServicesData,\r
+  EfiConventionalMemory,\r
+  EfiUnusableMemory,\r
+  EfiACPIReclaimMemory,\r
+  EfiACPIMemoryNVS,\r
+  EfiMemoryMappedIO,\r
+  EfiMemoryMappedIOPortSpace,\r
+  EfiPalCode,\r
+  EfiMaxMemoryType\r

 } EFI_MEMORY_TYPE;\r
 \r
 \r
 } EFI_MEMORY_TYPE;\r
 \r
 \r


@@ -43,56 +43,56 @@ typedef enum {
 // Data structure that precedes all of the standard EFI table types.\r
 // \r
 typedef struct {\r
 // Data structure that precedes all of the standard EFI table types.\r
 // \r
 typedef struct {\r

-       UINT64  Signature;\r
-       UINT32  Revision;\r
-       UINT32  HeaderSize;\r
-       UINT32  CRC32;\r
-       UINT32  Reserved;\r
+  UINT64  Signature;\r
+  UINT32  Revision;\r
+  UINT32  HeaderSize;\r
+  UINT32  CRC32;\r
+  UINT32  Reserved;\r

 } EFI_TABLE_HEADER;\r
 \r
 //\r
 // Attributes of variable.\r
 // \r
 } EFI_TABLE_HEADER;\r
 \r
 //\r
 // Attributes of variable.\r
 // \r

-#define EFI_VARIABLE_NON_VOLATILE                                                              0x00000001\r
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS                                        0x00000002\r
-#define EFI_VARIABLE_RUNTIME_ACCESS                                                    0x00000004\r
-#define EFI_VARIABLE_HARDWARE_ERROR_RECORD                             0x00000008\r
+#define EFI_VARIABLE_NON_VOLATILE                 0x00000001\r
+#define EFI_VARIABLE_BOOTSERVICE_ACCESS           0x00000002\r
+#define EFI_VARIABLE_RUNTIME_ACCESS               0x00000004\r
+#define EFI_VARIABLE_HARDWARE_ERROR_RECORD        0x00000008\r

 \r
 //\r
 // This attribute is identified by the mnemonic 'HR' \r
 // elsewhere in this specification.\r
 // \r
 \r
 //\r
 // This attribute is identified by the mnemonic 'HR' \r
 // elsewhere in this specification.\r
 // \r

-#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS                0x00000010\r
+#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS   0x00000010\r

 \r
 \r
 \r
 //\r
 // _WIN_CERTIFICATE.wCertificateType\r
 // \r
 \r
 \r
 \r
 //\r
 // _WIN_CERTIFICATE.wCertificateType\r
 // \r

-#define WIN_CERT_TYPE_EFI_PKCS115      0x0EF0\r
-#define WIN_CERT_TYPE_EFI_GUID                         0x0EF1\r
+#define WIN_CERT_TYPE_EFI_PKCS115   0x0EF0\r
+#define WIN_CERT_TYPE_EFI_GUID      0x0EF1\r

 \r
 /**\r
    \r
 \r
 /**\r
    \r

-       The WIN_CERTIFICATE structure is part of the PE/COFF\r
+  The WIN_CERTIFICATE structure is part of the PE/COFF\r

   specification and has the following definition:\r
 \r
   @param dwLength   The length of the entire certificate,\r
                     including the length of the header, in\r
                     bytes.\r
 \r
   specification and has the following definition:\r
 \r
   @param dwLength   The length of the entire certificate,\r
                     including the length of the header, in\r
                     bytes.\r
 \r

-  @param wRevision     The revision level of the WIN_CERTIFICATE\r
+  @param wRevision  The revision level of the WIN_CERTIFICATE\r

                     structure. The current revision level is\r
                     0x0200.\r
 \r
                     structure. The current revision level is\r
                     0x0200.\r
 \r

-  @param wCertificateType      The certificate type. See\r
+  @param wCertificateType   The certificate type. See\r

                             WIN_CERT_TYPE_xxx for the UEFI\r
                             certificate types. The UEFI\r
                             specification reserves the range of\r
                             certificate type values from 0x0EF0\r
                             to 0x0EFF.\r
 \r
                             WIN_CERT_TYPE_xxx for the UEFI\r
                             certificate types. The UEFI\r
                             specification reserves the range of\r
                             certificate type values from 0x0EF0\r
                             to 0x0EFF.\r
 \r

-  @param bCertificate  The actual certificate. The format of\r
+  @param bCertificate   The actual certificate. The format of\r

                         the certificate depends on\r
                         wCertificateType. The format of the UEFI\r
                         certificates is defined below.\r
                         the certificate depends on\r
                         wCertificateType. The format of the UEFI\r
                         certificates is defined below.\r


@@ -100,31 +100,31 @@ typedef struct {
 \r
 **/\r
 typedef struct _WIN_CERTIFICATE {\r
 \r
 **/\r
 typedef struct _WIN_CERTIFICATE {\r

-       UINT32  dwLength;\r
-       UINT16  wRevision;\r
-       UINT16  wCertificateType;\r
-       //UINT8 bCertificate[ANYSIZE_ARRAY];\r
+  UINT32  dwLength;\r
+  UINT16  wRevision;\r
+  UINT16  wCertificateType;\r
+  //UINT8 bCertificate[ANYSIZE_ARRAY];\r

 } WIN_CERTIFICATE;\r
 \r
 //\r
 // WIN_CERTIFICATE_UEFI_GUID.CertType\r
 // \r
 #define EFI_CERT_TYPE_RSA2048_SHA256_GUID \\r
 } WIN_CERTIFICATE;\r
 \r
 //\r
 // WIN_CERTIFICATE_UEFI_GUID.CertType\r
 // \r
 #define EFI_CERT_TYPE_RSA2048_SHA256_GUID \\r

-       {0xa7717414, 0xc616, 0x4977, {0x94, 0x20, 0x84, 0x47, 0x12, 0xa7, 0x35, 0xbf } }\r
+  {0xa7717414, 0xc616, 0x4977, {0x94, 0x20, 0x84, 0x47, 0x12, 0xa7, 0x35, 0xbf } }\r

 \r
 //\r
 // WIN_CERTIFICATE_UEFI_GUID.CertData\r
 // \r
 typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {\r
 \r
 //\r
 // WIN_CERTIFICATE_UEFI_GUID.CertData\r
 // \r
 typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {\r

-       UINT32  HashType;\r
-       UINT8   PublicKey[256];\r
-       UINT8   Signature[256];\r
+  UINT32  HashType;\r
+  UINT8   PublicKey[256];\r
+  UINT8   Signature[256];\r

 } EFI_CERT_BLOCK_RSA_2048_SHA256;\r
 \r
 \r
 /**\r
    \r
 } EFI_CERT_BLOCK_RSA_2048_SHA256;\r
 \r
 \r
 /**\r
    \r

-  @param Hdr   This is the standard WIN_CERTIFICATE header, where\r
+  @param Hdr  This is the standard WIN_CERTIFICATE header, where\r

               wCertificateType is set to\r
               WIN_CERT_TYPE_UEFI_GUID.\r
 \r
               wCertificateType is set to\r
               WIN_CERT_TYPE_UEFI_GUID.\r
 \r


@@ -132,12 +132,12 @@ typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {
                     format of the CertData. In this case, the\r
                     value is EFI_CERT_TYPE_RSA2048_SHA256_GUID.\r
 \r
                     format of the CertData. In this case, the\r
                     value is EFI_CERT_TYPE_RSA2048_SHA256_GUID.\r
 \r

-  @param CertData      This is the certificate data. The format of\r
+  @param CertData   This is the certificate data. The format of\r

                     the data is determined by the CertType. In\r
                     this case the value is\r
                     EFI_CERT_BLOCK_RSA_2048_SHA256.\r
 \r
                     the data is determined by the CertType. In\r
                     this case the value is\r
                     EFI_CERT_BLOCK_RSA_2048_SHA256.\r
 \r

-  @param Information   The WIN_CERTIFICATE_UEFI_GUID certificate\r
+  @param Information  The WIN_CERTIFICATE_UEFI_GUID certificate\r

                       type allows new types of certificates to\r
                       be developed for driver authentication\r
                       without requiring a new certificate type.\r
                       type allows new types of certificates to\r
                       be developed for driver authentication\r
                       without requiring a new certificate type.\r


@@ -149,9 +149,9 @@ typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 {
 \r
 **/\r
 typedef struct _WIN_CERTIFICATE_UEFI_GUID {\r
 \r
 **/\r
 typedef struct _WIN_CERTIFICATE_UEFI_GUID {\r

-       WIN_CERTIFICATE         Hdr;\r
-       EFI_GUID                                        CertType;\r
-       // UINT8                                                CertData[ANYSIZE_ARRAY];\r
+  WIN_CERTIFICATE   Hdr;\r
+  EFI_GUID          CertType;\r
+  // UINT8            CertData[ANYSIZE_ARRAY];\r

 } WIN_CERTIFICATE_UEFI_GUID;\r
 \r
 \r
 } WIN_CERTIFICATE_UEFI_GUID;\r
 \r
 \r


@@ -165,9 +165,9 @@ typedef struct _WIN_CERTIFICATE_UEFI_GUID {
   signature.\r
   \r
   The WIN_CERTIFICATE_UEFI_PKCS1_15 structure is derived from\r
   signature.\r
   \r
   The WIN_CERTIFICATE_UEFI_PKCS1_15 structure is derived from\r

-       WIN_CERTIFICATE and encapsulate the information needed to  \r
-       implement the RSASSA-PKCS1-v1_5 digital signature algorithm as  \r
-       specified in RFC2437.  \r
+  WIN_CERTIFICATE and encapsulate the information needed to  \r
+  implement the RSASSA-PKCS1-v1_5 digital signature algorithm as  \r
+  specified in RFC2437.  \r

   \r
   @param Hdr  This is the standard WIN_CERTIFICATE header, where\r
               wCertificateType is set to\r
   \r
   @param Hdr  This is the standard WIN_CERTIFICATE header, where\r
               wCertificateType is set to\r


@@ -180,7 +180,7 @@ typedef struct _WIN_CERTIFICATE_UEFI_GUID {
                         in Section 26.4.1. See\r
                         EFI_HASH_ALGORITHM_x.\r
   \r
                         in Section 26.4.1. See\r
                         EFI_HASH_ALGORITHM_x.\r
   \r

-  @param Signature     This is the actual digital signature. The\r
+  @param Signature  This is the actual digital signature. The\r

                     size of the signature is the same size as\r
                     the key (1024-bit key is 128 bytes) and can\r
                     be determined by subtracting the length of\r
                     size of the signature is the same size as\r
                     the key (1024-bit key is 128 bytes) and can\r
                     be determined by subtracting the length of\r


@@ -190,34 +190,34 @@ typedef struct _WIN_CERTIFICATE_UEFI_GUID {
 \r
 **/\r
 typedef struct _WIN_CERTIFICATE_EFI_PKCS1_15 {\r
 \r
 **/\r
 typedef struct _WIN_CERTIFICATE_EFI_PKCS1_15 {\r

-       WIN_CERTIFICATE Hdr;\r
-       EFI_GUID                                HashAlgorithm;\r
-       // UINT8 Signature[ANYSIZE_ARRAY];\r
+  WIN_CERTIFICATE Hdr;\r
+  EFI_GUID        HashAlgorithm;\r
+  // UINT8 Signature[ANYSIZE_ARRAY];\r

 } WIN_CERTIFICATE_EFI_PKCS1_15;\r
 \r
 \r
 /**\r
    \r
 } WIN_CERTIFICATE_EFI_PKCS1_15;\r
 \r
 \r
 /**\r
    \r

-       AuthInfo is a WIN_CERTIFICATE using the wCertificateType\r
-       WIN_CERTIFICATE_UEFI_GUID and the CertType\r
-       EFI_CERT_TYPE_RSA2048_SHA256. If the attribute specifies\r
-       authenticated access, then the Data buffer should begin with an\r
-       authentication descriptor prior to the data payload and DataSize\r
-       should reflect the the data.and descriptor size. The caller\r
-       shall digest the Monotonic Count value and the associated data\r
-       for the variable update using the SHA-256 1-way hash algorithm.\r
-       The ensuing the 32-byte digest will be signed using the private\r
-       key associated w/ the public/private 2048-bit RSA key-pair. The\r
-       WIN_CERTIFICATE shall be used to describe the signature of the\r
-       Variable data *Data. In addition, the signature will also\r
+  AuthInfo is a WIN_CERTIFICATE using the wCertificateType\r
+  WIN_CERTIFICATE_UEFI_GUID and the CertType\r
+  EFI_CERT_TYPE_RSA2048_SHA256. If the attribute specifies\r
+  authenticated access, then the Data buffer should begin with an\r
+  authentication descriptor prior to the data payload and DataSize\r
+  should reflect the the data.and descriptor size. The caller\r
+  shall digest the Monotonic Count value and the associated data\r
+  for the variable update using the SHA-256 1-way hash algorithm.\r
+  The ensuing the 32-byte digest will be signed using the private\r
+  key associated w/ the public/private 2048-bit RSA key-pair. The\r
+  WIN_CERTIFICATE shall be used to describe the signature of the\r
+  Variable data *Data. In addition, the signature will also\r

   include the MonotonicCount value to guard against replay attacks\r
   \r
   include the MonotonicCount value to guard against replay attacks\r
   \r

-  @param       MonotonicCount  Included in the signature of\r
+  @param  MonotonicCount  Included in the signature of\r

                           AuthInfo.Used to ensure freshness/no\r
                           replay. Incremented during each\r
                           "Write" access.\r
   \r
                           AuthInfo.Used to ensure freshness/no\r
                           replay. Incremented during each\r
                           "Write" access.\r
   \r

-  @param AuthInfo      Provides the authorization for the variable\r
+  @param AuthInfo   Provides the authorization for the variable\r

                     access. It is a signature across the\r
                     variable data and the  Monotonic Count\r
                     value. Caller uses Private key that is\r
                     access. It is a signature across the\r
                     variable data and the  Monotonic Count\r
                     value. Caller uses Private key that is\r


@@ -226,8 +226,8 @@ typedef struct _WIN_CERTIFICATE_EFI_PKCS1_15 {
 \r
 **/\r
 typedef struct {\r
 \r
 **/\r
 typedef struct {\r

-       UINT64                                                                                  MonotonicCount;\r
-       WIN_CERTIFICATE_UEFI_GUID       AuthInfo;\r
+  UINT64                      MonotonicCount;\r
+  WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r

 } EFI_VARIABLE_AUTHENTICATION;\r
 \r
 #endif\r
 } EFI_VARIABLE_AUTHENTICATION;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 70e8b91c4f2ca7becae702aa77da39309505bd30..4eef223db0d1e809b98a9b567d050b823e3b2076 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -72,9 +72,9 @@ typedef enum {
 //\r
 // physical memory protection on range\r
 //\r
 //\r
 // physical memory protection on range\r
 //\r

-#define EFI_MEMORY_WP  0x0000000000001000ULL\r
-#define EFI_MEMORY_RP  0x0000000000002000ULL\r
-#define EFI_MEMORY_XP  0x0000000000004000ULL\r
+#define EFI_MEMORY_WP   0x0000000000001000ULL\r
+#define EFI_MEMORY_RP   0x0000000000002000ULL\r
+#define EFI_MEMORY_XP   0x0000000000004000ULL\r

 \r
 //\r
 // range requires a runtime mapping\r
 \r
 //\r
 // range requires a runtime mapping\r


@@ -83,11 +83,11 @@ typedef enum {
 \r
 #define EFI_MEMORY_DESCRIPTOR_VERSION 1\r
 typedef struct {\r
 \r
 #define EFI_MEMORY_DESCRIPTOR_VERSION 1\r
 typedef struct {\r

-       UINT32                                                          Type;\r
-       EFI_PHYSICAL_ADDRESS    PhysicalStart;\r
-       EFI_VIRTUAL_ADDRESS     VirtualStart;\r
-       UINT64                                                          NumberOfPages;\r
-       UINT64                                                          Attribute;\r
+  UINT32                Type;\r
+  EFI_PHYSICAL_ADDRESS  PhysicalStart;\r
+  EFI_VIRTUAL_ADDRESS   VirtualStart;\r
+  UINT64                NumberOfPages;\r
+  UINT64                Attribute;\r

 } EFI_MEMORY_DESCRIPTOR;\r
 \r
 //\r
 } EFI_MEMORY_DESCRIPTOR;\r
 \r
 //\r


@@ -336,13 +336,13 @@ EFI_STATUS
 // EVT_TIMER might be ¡°Ored¡± with EVT_NOTIFY_WAIT or\r
 // EVT_NOTIFY_SIGNAL.\r
 //\r
 // EVT_TIMER might be ¡°Ored¡± with EVT_NOTIFY_WAIT or\r
 // EVT_NOTIFY_SIGNAL.\r
 //\r

-#define EVT_TIMER                                                                                              0x80000000\r
-#define EVT_RUNTIME                                                                                    0x40000000\r
+#define EVT_TIMER                         0x80000000\r
+#define EVT_RUNTIME                       0x40000000\r

 \r
 \r

-#define EVT_NOTIFY_WAIT                                                                                0x00000100\r
-#define EVT_NOTIFY_SIGNAL                                                                      0x00000200\r
-#define EVT_SIGNAL_EXIT_BOOT_SERVICES                  0x00000201\r
-#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE      0x60000202\r
+#define EVT_NOTIFY_WAIT                   0x00000100\r
+#define EVT_NOTIFY_SIGNAL                 0x00000200\r
+#define EVT_SIGNAL_EXIT_BOOT_SERVICES     0x00000201\r
+#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202\r

 \r
 \r
 //\r
 \r
 \r
 //\r


@@ -638,9 +638,9 @@ EFI_STATUS
 // real time clock device as exposed through the EFI interfaces.\r
 // \r
 typedef struct {\r
 // real time clock device as exposed through the EFI interfaces.\r
 // \r
 typedef struct {\r

-       UINT32          Resolution;\r
-       UINT32          Accuracy;\r
-       BOOLEAN         SetsToZero;\r
+  UINT32    Resolution;\r
+  UINT32    Accuracy;\r
+  BOOLEAN   SetsToZero;\r

 } EFI_TIME_CAPABILITIES;\r
 \r
 /**\r
 } EFI_TIME_CAPABILITIES;\r
 \r
 /**\r


@@ -1542,153 +1542,153 @@ EFI_STATUS
 //\r
 // EFI Runtime Services Table\r
 //\r
 //\r
 // EFI Runtime Services Table\r
 //\r

-#define EFI_SYSTEM_TABLE_SIGNATURE                     0x5453595320494249\r
-#define EFI_SYSTEM_TABLE_REVISION                      ((2<<16) | (10))\r
-#define EFI_2_10_SYSTEM_TABLE_REVISION         ((2<<16) | (10))\r
-#define EFI_2_00_SYSTEM_TABLE_REVISION         ((2<<16) | (00))\r
-#define EFI_1_10_SYSTEM_TABLE_REVISION         ((1<<16) | (10))\r
-#define EFI_1_02_SYSTEM_TABLE_REVISION         ((1<<16) | (02))\r
+#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249\r
+#define EFI_SYSTEM_TABLE_REVISION       ((2<<16) | (10))\r
+#define EFI_2_10_SYSTEM_TABLE_REVISION  ((2<<16) | (10))\r
+#define EFI_2_00_SYSTEM_TABLE_REVISION  ((2<<16) | (00))\r
+#define EFI_1_10_SYSTEM_TABLE_REVISION  ((1<<16) | (10))\r
+#define EFI_1_02_SYSTEM_TABLE_REVISION  ((1<<16) | (02))\r

 \r
 \r

-#define EFI_RUNTIME_SERVICES_SIGNATURE         0x56524553544e5552\r
-#define EFI_RUNTIME_SERVICES_REVISION  EFI_2_00_SYSTEM_TABLE_REVISION\r
+#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552\r
+#define EFI_RUNTIME_SERVICES_REVISION   EFI_2_00_SYSTEM_TABLE_REVISION\r

 \r
 typedef struct {\r
 \r
 typedef struct {\r

-       EFI_TABLE_HEADER Hdr;\r
-\r
-       //\r
-       // Time Services\r
-       //\r
-       EFI_GET_TIME                                                                            GetTime;\r
-       EFI_SET_TIME                                                                            SetTime;\r
-       EFI_GET_WAKEUP_TIME                                             GetWakeupTime;\r
-       EFI_SET_WAKEUP_TIME                                             SetWakeupTime;\r
-\r
-       //\r
-       // Virtual Memory Services\r
-       //\r
-       EFI_SET_VIRTUAL_ADDRESS_MAP                     SetVirtualAddressMap;\r
-       EFI_CONVERT_POINTER                                             ConvertPointer;\r
-\r
-       //\r
-       // Variable Services\r
-       //\r
-       EFI_GET_VARIABLE                                                                GetVariable;\r
-       EFI_GET_NEXT_VARIABLE_NAME                      GetNextVariableName;\r
-       EFI_SET_VARIABLE                                                                SetVariable;\r
-\r
-       //\r
-       // Miscellaneous Services\r
-       //\r
-       EFI_GET_NEXT_HIGH_MONO_COUNT            GetNextHighMonotonicCount;\r
-       EFI_RESET_SYSTEM                                                                ResetSystem;\r
-\r
-       //\r
-       // UEFI 2.0 Capsule Services\r
-       //\r
-       EFI_UPDATE_CAPSULE                                                      UpdateCapsule;\r
-       EFI_QUERY_CAPSULE_CAPABILITIES  QueryCapsuleCapabilities;\r
-\r
-       //\r
-       // Miscellaneous UEFI 2.0 Service\r
-       //\r
-       EFI_QUERY_VARIABLE_INFO                                 QueryVariableInfo;\r
+  EFI_TABLE_HEADER Hdr;\r
+\r
+  //\r
+  // Time Services\r
+  //\r
+  EFI_GET_TIME                    GetTime;\r
+  EFI_SET_TIME                    SetTime;\r
+  EFI_GET_WAKEUP_TIME             GetWakeupTime;\r
+  EFI_SET_WAKEUP_TIME             SetWakeupTime;\r
+\r
+  //\r
+  // Virtual Memory Services\r
+  //\r
+  EFI_SET_VIRTUAL_ADDRESS_MAP     SetVirtualAddressMap;\r
+  EFI_CONVERT_POINTER             ConvertPointer;\r
+\r
+  //\r
+  // Variable Services\r
+  //\r
+  EFI_GET_VARIABLE                GetVariable;\r
+  EFI_GET_NEXT_VARIABLE_NAME      GetNextVariableName;\r
+  EFI_SET_VARIABLE                SetVariable;\r
+\r
+  //\r
+  // Miscellaneous Services\r
+  //\r
+  EFI_GET_NEXT_HIGH_MONO_COUNT    GetNextHighMonotonicCount;\r
+  EFI_RESET_SYSTEM                ResetSystem;\r
+\r
+  //\r
+  // UEFI 2.0 Capsule Services\r
+  //\r
+  EFI_UPDATE_CAPSULE              UpdateCapsule;\r
+  EFI_QUERY_CAPSULE_CAPABILITIES  QueryCapsuleCapabilities;\r
+\r
+  //\r
+  // Miscellaneous UEFI 2.0 Service\r
+  //\r
+  EFI_QUERY_VARIABLE_INFO         QueryVariableInfo;\r

 } EFI_RUNTIME_SERVICES;\r
 \r
 \r
 } EFI_RUNTIME_SERVICES;\r
 \r
 \r

-#define EFI_BOOT_SERVICES_SIGNATURE    0x56524553544f4f42\r
-#define EFI_BOOT_SERVICES_REVISION             ((2<<16) | (00))\r
+#define EFI_BOOT_SERVICES_SIGNATURE   0x56524553544f4f42\r
+#define EFI_BOOT_SERVICES_REVISION    ((2<<16) | (00))\r

 \r
 typedef struct {\r
 \r
 typedef struct {\r

-       EFI_TABLE_HEADER        Hdr;\r
-       \r
-       //\r
-       // Task Priority Services\r
-       //\r
-       EFI_RAISE_TPL                                                                   RaiseTPL;\r
-       EFI_RESTORE_TPL                                                                 RestoreTPL;\r
-\r
-       //\r
-       // Memory Services\r
-       //\r
-       EFI_ALLOCATE_PAGES                                                      AllocatePages;\r
-       EFI_FREE_PAGES                                                                  FreePages;\r
-       EFI_GET_MEMORY_MAP                                                      GetMemoryMap;\r
-       EFI_ALLOCATE_POOL                                                       AllocatePool;\r
-       EFI_FREE_POOL                                                                   FreePool;\r
-\r
-       //\r
-       // Event & Timer Services\r
-       //\r
-       EFI_CREATE_EVENT                                                                        CreateEvent;\r
-       EFI_SET_TIMER                                                                           SetTimer;\r
-       EFI_WAIT_FOR_EVENT                                                              WaitForEvent;\r
-       EFI_SIGNAL_EVENT                                                                        SignalEvent;\r
-       EFI_CLOSE_EVENT                                                                         CloseEvent;\r
-       EFI_CHECK_EVENT                                                                         CheckEvent;\r
-\r
-       //\r
-       // Protocol Handler Services\r
-       //\r
-       EFI_INSTALL_PROTOCOL_INTERFACE          InstallProtocolInterface;\r
-       EFI_REINSTALL_PROTOCOL_INTERFACE        ReinstallProtocolInterface;\r
-       EFI_UNINSTALL_PROTOCOL_INTERFACE        UninstallProtocolInterface;\r
-       EFI_HANDLE_PROTOCOL                                                     HandleProtocol;\r
-       VOID                                                                                                                    *Reserved;\r
-       EFI_REGISTER_PROTOCOL_NOTIFY                    RegisterProtocolNotify;\r
-       EFI_LOCATE_HANDLE                                                               LocateHandle;\r
-       EFI_LOCATE_DEVICE_PATH                                          LocateDevicePath;\r
-       EFI_INSTALL_CONFIGURATION_TABLE         InstallConfigurationTable;\r
-\r
-       //\r
-       // Image Services\r
-       //\r
-       EFI_IMAGE_LOAD                                                                          LoadImage;\r
-       EFI_IMAGE_START                                                                         StartImage;\r
-       EFI_EXIT                                                                                                        Exit;\r
-       EFI_IMAGE_UNLOAD                                                                        UnloadImage;\r
-       EFI_EXIT_BOOT_SERVICES                                          ExitBootServices;\r
-\r
-       //\r
-       // Miscellaneous Services\r
-       //\r
-       EFI_GET_NEXT_MONOTONIC_COUNT                    GetNextMonotonicCount;\r
-       EFI_STALL                                                                                               Stall;\r
-       EFI_SET_WATCHDOG_TIMER                                          SetWatchdogTimer;\r
-\r
-       //\r
-       // DriverSupport Services\r
-       //\r
-       EFI_CONNECT_CONTROLLER                                          ConnectController;\r
-       EFI_DISCONNECT_CONTROLLER                               DisconnectController;\r
-\r
-       //\r
-       // Open and Close Protocol Services\r
-       //\r
-       EFI_OPEN_PROTOCOL                                                               OpenProtocol;\r
-       EFI_CLOSE_PROTOCOL                                                              CloseProtocol;\r
-       EFI_OPEN_PROTOCOL_INFORMATION           OpenProtocolInformation;\r
-\r
-       //\r
-       // Library Services\r
-       //\r
-       EFI_PROTOCOLS_PER_HANDLE                                        ProtocolsPerHandle;\r
-       EFI_LOCATE_HANDLE_BUFFER                                        LocateHandleBuffer;\r
-       EFI_LOCATE_PROTOCOL                                                     LocateProtocol;\r
-       EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES                InstallMultipleProtocolInterfaces;\r
-       EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES      UninstallMultipleProtocolInterfaces;\r
-\r
-       //\r
-       // 32-bit CRC Services\r
-       //\r
-       EFI_CALCULATE_CRC32                                                     CalculateCrc32;\r
-\r
-       //\r
-       // Miscellaneous Services\r
-       //\r
-       EFI_COPY_MEM                                                                                    CopyMem;\r
-       EFI_SET_MEM                                                                                     SetMem;\r
-\r
-       EFI_CREATE_EVENT_EX                                                     CreateEventEx;\r
+  EFI_TABLE_HEADER  Hdr;\r
+  \r
+  //\r
+  // Task Priority Services\r
+  //\r
+  EFI_RAISE_TPL                   RaiseTPL;\r
+  EFI_RESTORE_TPL                 RestoreTPL;\r
+\r
+  //\r
+  // Memory Services\r
+  //\r
+  EFI_ALLOCATE_PAGES              AllocatePages;\r
+  EFI_FREE_PAGES                  FreePages;\r
+  EFI_GET_MEMORY_MAP              GetMemoryMap;\r
+  EFI_ALLOCATE_POOL               AllocatePool;\r
+  EFI_FREE_POOL                   FreePool;\r
+\r
+  //\r
+  // Event & Timer Services\r
+  //\r
+  EFI_CREATE_EVENT                  CreateEvent;\r
+  EFI_SET_TIMER                     SetTimer;\r
+  EFI_WAIT_FOR_EVENT                WaitForEvent;\r
+  EFI_SIGNAL_EVENT                  SignalEvent;\r
+  EFI_CLOSE_EVENT                   CloseEvent;\r
+  EFI_CHECK_EVENT                   CheckEvent;\r
+\r
+  //\r
+  // Protocol Handler Services\r
+  //\r
+  EFI_INSTALL_PROTOCOL_INTERFACE    InstallProtocolInterface;\r
+  EFI_REINSTALL_PROTOCOL_INTERFACE  ReinstallProtocolInterface;\r
+  EFI_UNINSTALL_PROTOCOL_INTERFACE  UninstallProtocolInterface;\r
+  EFI_HANDLE_PROTOCOL               HandleProtocol;\r
+  VOID                              *Reserved;\r
+  EFI_REGISTER_PROTOCOL_NOTIFY      RegisterProtocolNotify;\r
+  EFI_LOCATE_HANDLE                 LocateHandle;\r
+  EFI_LOCATE_DEVICE_PATH            LocateDevicePath;\r
+  EFI_INSTALL_CONFIGURATION_TABLE   InstallConfigurationTable;\r
+\r
+  //\r
+  // Image Services\r
+  //\r
+  EFI_IMAGE_LOAD                    LoadImage;\r
+  EFI_IMAGE_START                   StartImage;\r
+  EFI_EXIT                          Exit;\r
+  EFI_IMAGE_UNLOAD                  UnloadImage;\r
+  EFI_EXIT_BOOT_SERVICES            ExitBootServices;\r
+\r
+  //\r
+  // Miscellaneous Services\r
+  //\r
+  EFI_GET_NEXT_MONOTONIC_COUNT      GetNextMonotonicCount;\r
+  EFI_STALL                         Stall;\r
+  EFI_SET_WATCHDOG_TIMER            SetWatchdogTimer;\r
+\r
+  //\r
+  // DriverSupport Services\r
+  //\r
+  EFI_CONNECT_CONTROLLER            ConnectController;\r
+  EFI_DISCONNECT_CONTROLLER         DisconnectController;\r
+\r
+  //\r
+  // Open and Close Protocol Services\r
+  //\r
+  EFI_OPEN_PROTOCOL                 OpenProtocol;\r
+  EFI_CLOSE_PROTOCOL                CloseProtocol;\r
+  EFI_OPEN_PROTOCOL_INFORMATION     OpenProtocolInformation;\r
+\r
+  //\r
+  // Library Services\r
+  //\r
+  EFI_PROTOCOLS_PER_HANDLE          ProtocolsPerHandle;\r
+  EFI_LOCATE_HANDLE_BUFFER          LocateHandleBuffer;\r
+  EFI_LOCATE_PROTOCOL               LocateProtocol;\r
+  EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES    InstallMultipleProtocolInterfaces;\r
+  EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES  UninstallMultipleProtocolInterfaces;\r
+\r
+  //\r
+  // 32-bit CRC Services\r
+  //\r
+  EFI_CALCULATE_CRC32               CalculateCrc32;\r
+\r
+  //\r
+  // Miscellaneous Services\r
+  //\r
+  EFI_COPY_MEM                      CopyMem;\r
+  EFI_SET_MEM                       SetMem;\r
+\r
+  EFI_CREATE_EVENT_EX               CreateEventEx;\r

 } EFI_BOOT_SERVICES;\r
 \r
 //\r
 } EFI_BOOT_SERVICES;\r
 \r
 //\r


@@ -1696,24 +1696,24 @@ typedef struct {
 // EFI System Table.\r
 // \r
 typedef struct{\r
 // EFI System Table.\r
 // \r
 typedef struct{\r

-       EFI_GUID                                                                                                        VendorGuid;\r
-       VOID                                                                                                                    *VendorTable;\r
+  EFI_GUID                          VendorGuid;\r
+  VOID                              *VendorTable;\r

 } EFI_CONFIGURATION_TABLE;\r
 \r
 struct _EFI_SYSTEM_TABLE {\r
 } EFI_CONFIGURATION_TABLE;\r
 \r
 struct _EFI_SYSTEM_TABLE {\r

-       EFI_TABLE_HEADER        Hdr;\r
-       CHAR16                                                                                                          *FirmwareVendor;\r
-       UINT32                                                                                                          FirmwareRevision;\r
-       EFI_HANDLE                                                                                              ConsoleInHandle;\r
-       EFI_SIMPLE_TEXT_INPUT_PROTOCOL          *ConIn;\r
-       EFI_HANDLE                                                                                              ConsoleOutHandle;\r
-       EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL         *ConOut;\r
-       EFI_HANDLE                                                                                              StandardErrorHandle;\r
-       EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL         *StdErr;\r
-       EFI_RUNTIME_SERVICES                                                    *RuntimeServices;\r
-       EFI_BOOT_SERVICES                                                               *BootServices;\r
-       UINTN                                                                                                           NumberOfTableEntries;\r
-       EFI_CONFIGURATION_TABLE                                         *ConfigurationTable;\r
+  EFI_TABLE_HEADER  Hdr;\r
+  CHAR16                            *FirmwareVendor;\r
+  UINT32                            FirmwareRevision;\r
+  EFI_HANDLE                        ConsoleInHandle;\r
+  EFI_SIMPLE_TEXT_INPUT_PROTOCOL    *ConIn;\r
+  EFI_HANDLE                        ConsoleOutHandle;\r
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *ConOut;\r
+  EFI_HANDLE                        StandardErrorHandle;\r
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *StdErr;\r
+  EFI_RUNTIME_SERVICES              *RuntimeServices;\r
+  EFI_BOOT_SERVICES                 *BootServices;\r
+  UINTN                             NumberOfTableEntries;\r
+  EFI_CONFIGURATION_TABLE           *ConfigurationTable;\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r