Fix buger in DxeMain module and modify uefispec.h coding style

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

diff --git a/EdkModulePkg/Core/Dxe/Hand/DriverSupport.c b/EdkModulePkg/Core/Dxe/Hand/DriverSupport.c
index aa601fba083d9f639d2130b1877c12e269d6e1f9..30738572c932221ac33a000b00f055e11867d583 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Hand/DriverSupport.c
+++ b/EdkModulePkg/Core/Dxe/Hand/DriverSupport.c
@@ -411,10 +411,10 @@ Returns:
   // Sort the remaining DriverBinding Protocol based on their Version field from\r
   // highest to lowest.\r
   //\r
-  for ( ; SortIndex < DriverBindingHandleCount; SortIndex++) {\r
+  for ( ; SortIndex < NumberOfSortedDriverBindingProtocols; SortIndex++) {\r
     HighestVersion = SortedDriverBindingProtocols[SortIndex]->Version;\r
     HighestIndex   = SortIndex;\r
-    for (Index = SortIndex + 1; Index < DriverBindingHandleCount; Index++) {\r
+    for (Index = SortIndex + 1; Index < NumberOfSortedDriverBindingProtocols; Index++) {\r
       if (SortedDriverBindingProtocols[Index]->Version > HighestVersion) {\r
         HighestVersion = SortedDriverBindingProtocols[Index]->Version;\r
         HighestIndex   = Index;\r

diff --git a/MdePkg/Include/Common/UefiBaseTypes.h b/MdePkg/Include/Common/UefiBaseTypes.h
index 4954c10bf223b8d2d68860f814db02db7e1d42ce..f88dd4c23d35dfd02e2d985089b71c831677b751 100644 (file)
--- a/MdePkg/Include/Common/UefiBaseTypes.h
+++ b/MdePkg/Include/Common/UefiBaseTypes.h
@@ -82,4 +82,40 @@ typedef RETURN_STATUS EFI_STATUS;
 \r
 #define EFI_PAGES_TO_SIZE(a)   ( (a) << EFI_PAGE_SHIFT)\r
 \r
+//\r
+// EFI Time Abstraction:\r
+//  Year:       2000 - 20XX\r
+//  Month:      1 - 12\r
+//  Day:        1 - 31\r
+//  Hour:       0 - 23\r
+//  Minute:     0 - 59\r
+//  Second:     0 - 59\r
+//  Nanosecond: 0 - 999,999,999\r
+//  TimeZone:   -1440 to 1440 or 2047\r
+//\r
+typedef struct {\r
+  UINT16  Year;\r
+  UINT8   Month;\r
+  UINT8   Day;\r
+  UINT8   Hour;\r
+  UINT8   Minute;\r
+  UINT8   Second;\r
+  UINT8   Pad1;\r
+  UINT32  Nanosecond;\r
+  INT16   TimeZone;\r
+  UINT8   Daylight;\r
+  UINT8   Pad2;\r
+} EFI_TIME;\r
+\r
+//\r
+// Bit definitions for EFI_TIME.Daylight\r
+//\r
+#define EFI_TIME_ADJUST_DAYLIGHT  0x01\r
+#define EFI_TIME_IN_DAYLIGHT      0x02\r
+\r
+//\r
+// Value definition for EFI_TIME.TimeZone\r
+//\r
+#define EFI_UNSPECIFIED_TIMEZONE  0x07FF\r
+\r
 #endif\r

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index d648b1b9f1a78d2ca08d0a3134f77fdc8af2e164..edb35111df9e495055c98ce35c1a58524a65dfd3 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -23,56 +23,14 @@
 \r
 #include <Common/MultiPhase.h>\r
 \r
-//\r
-// EFI Data Types based on ANSI C integer types in EfiBind.h\r
-//\r
-\r
-\r
 //\r
 // EFI Data Types derived from other EFI data types.\r
 //\r
-\r
 #define NULL_HANDLE ((VOID *) 0)\r
 \r
-typedef VOID *EFI_EVENT;\r
+typedef VOID  *EFI_EVENT;\r
 typedef UINTN EFI_TPL;\r
 \r
-//\r
-// EFI Time Abstraction:\r
-//  Year:       2000 - 20XX\r
-//  Month:      1 - 12\r
-//  Day:        1 - 31\r
-//  Hour:       0 - 23\r
-//  Minute:     0 - 59\r
-//  Second:     0 - 59\r
-//  Nanosecond: 0 - 999,999,999\r
-//  TimeZone:   -1440 to 1440 or 2047\r
-//\r
-typedef struct {\r
-  UINT16  Year;\r
-  UINT8   Month;\r
-  UINT8   Day;\r
-  UINT8   Hour;\r
-  UINT8   Minute;\r
-  UINT8   Second;\r
-  UINT8   Pad1;\r
-  UINT32  Nanosecond;\r
-  INT16   TimeZone;\r
-  UINT8   Daylight;\r
-  UINT8   Pad2;\r
-} EFI_TIME;\r
-\r
-//\r
-// Bit definitions for EFI_TIME.Daylight\r
-//\r
-#define EFI_TIME_ADJUST_DAYLIGHT  0x01\r
-#define EFI_TIME_IN_DAYLIGHT      0x02\r
-\r
-//\r
-// Value definition for EFI_TIME.TimeZone\r
-//\r
-#define EFI_UNSPECIFIED_TIMEZONE  0x07FF\r
-\r
 //\r
 // Networking\r
 //\r
@@ -148,7 +106,7 @@ typedef struct {
 //\r
 // Declare forward referenced data structures\r
 //\r
-typedef struct  _EFI_SYSTEM_TABLE   EFI_SYSTEM_TABLE;\r
+typedef struct _EFI_SYSTEM_TABLE   EFI_SYSTEM_TABLE;\r
 \r
 /**\r
   Allocates memory pages from the system.\r
@@ -171,10 +129,10 @@ typedef struct  _EFI_SYSTEM_TABLE   EFI_SYSTEM_TABLE;
 typedef              \r
 EFI_STATUS           \r
 (EFIAPI *EFI_ALLOCATE_PAGES) (\r
-  IN EFI_ALLOCATE_TYPE            Type,\r
-  IN EFI_MEMORY_TYPE              MemoryType,\r
-  IN UINTN                        Pages,\r
-  IN OUT EFI_PHYSICAL_ADDRESS     *Memory\r
+  IN     EFI_ALLOCATE_TYPE            Type,\r
+  IN     EFI_MEMORY_TYPE              MemoryType,\r
+  IN     UINTN                        Pages,\r
+  IN OUT EFI_PHYSICAL_ADDRESS         *Memory\r
   );\r
 \r
 /**\r
@@ -192,8 +150,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FREE_PAGES) (\r
-  IN EFI_PHYSICAL_ADDRESS         Memory,\r
-  IN UINTN                        Pages\r
+  IN  EFI_PHYSICAL_ADDRESS         Memory,\r
+  IN  UINTN                        Pages\r
   );\r
 \r
 /**\r
@@ -220,11 +178,11 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_GET_MEMORY_MAP) (\r
-  IN OUT UINTN                    *MemoryMapSize,\r
-  IN OUT EFI_MEMORY_DESCRIPTOR    *MemoryMap,\r
-  OUT UINTN                       *MapKey,\r
-  OUT UINTN                       *DescriptorSize,\r
-  OUT UINT32                      *DescriptorVersion\r
+  IN OUT UINTN                       *MemoryMapSize,\r
+  IN OUT EFI_MEMORY_DESCRIPTOR       *MemoryMap,\r
+  OUT    UINTN                       *MapKey,\r
+  OUT    UINTN                       *DescriptorSize,\r
+  OUT    UINT32                      *DescriptorVersion\r
   );\r
 \r
 #define NextMemoryDescriptor(_Ptr, _Size)   ((EFI_MEMORY_DESCRIPTOR *) (((UINT8 *) (_Ptr)) + (_Size)))\r
@@ -246,9 +204,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_ALLOCATE_POOL) (\r
-  IN EFI_MEMORY_TYPE              PoolType,\r
-  IN UINTN                        Size,\r
-  OUT VOID                        **Buffer\r
+  IN  EFI_MEMORY_TYPE              PoolType,\r
+  IN  UINTN                        Size,\r
+  OUT VOID                         **Buffer\r
   );\r
 \r
 /**\r
@@ -263,7 +221,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_FREE_POOL) (\r
-  IN VOID                         *Buffer\r
+  IN  VOID                         *Buffer\r
   );\r
 \r
 /**\r
@@ -288,10 +246,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_VIRTUAL_ADDRESS_MAP) (\r
-  IN UINTN                        MemoryMapSize,\r
-  IN UINTN                        DescriptorSize,\r
-  IN UINT32                       DescriptorVersion,\r
-  IN EFI_MEMORY_DESCRIPTOR        *VirtualMap\r
+  IN  UINTN                        MemoryMapSize,\r
+  IN  UINTN                        DescriptorSize,\r
+  IN  UINT32                       DescriptorVersion,\r
+  IN  EFI_MEMORY_DESCRIPTOR        *VirtualMap\r
   );\r
 \r
 /**\r
@@ -347,9 +305,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_DISCONNECT_CONTROLLER) (\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_HANDLE                     DriverImageHandle, OPTIONAL\r
-  IN EFI_HANDLE                     ChildHandle        OPTIONAL\r
+  IN  EFI_HANDLE                     ControllerHandle,\r
+  IN  EFI_HANDLE                     DriverImageHandle, OPTIONAL\r
+  IN  EFI_HANDLE                     ChildHandle        OPTIONAL\r
   );\r
 \r
 //\r
@@ -376,7 +334,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_CONVERT_POINTER) (\r
-  IN UINTN                          DebugDisposition,\r
+  IN     UINTN                      DebugDisposition,\r
   IN OUT VOID                       **Address\r
   );\r
 \r
@@ -430,8 +388,8 @@ EFI_STATUS
 typedef\r
 VOID\r
 (EFIAPI *EFI_EVENT_NOTIFY) (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN  EFI_EVENT                Event,\r
+  IN  VOID                     *Context\r
   );\r
 \r
 /**                                                                                                   \r
@@ -453,11 +411,11 @@ VOID
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_CREATE_EVENT) (\r
-  IN UINT32                       Type,\r
-  IN EFI_TPL                      NotifyTpl,\r
-  IN EFI_EVENT_NOTIFY             NotifyFunction,\r
-  IN VOID                         *NotifyContext,\r
-  OUT EFI_EVENT                   *Event\r
+  IN  UINT32                       Type,\r
+  IN  EFI_TPL                      NotifyTpl,\r
+  IN  EFI_EVENT_NOTIFY             NotifyFunction,\r
+  IN  VOID                         *NotifyContext,\r
+  OUT EFI_EVENT                    *Event\r
   );\r
 \r
 /**                                                                                                   \r
@@ -480,12 +438,12 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_CREATE_EVENT_EX) (\r
-  IN UINT32                 Type,\r
-  IN EFI_TPL                NotifyTpl      OPTIONAL,\r
-  IN EFI_EVENT_NOTIFY       NotifyFunction OPTIONAL,\r
-  IN CONST VOID             *NotifyContext OPTIONAL,\r
-  IN CONST EFI_GUID         *EventGroup    OPTIONAL,\r
-  OUT EFI_EVENT             *Event\r
+  IN       UINT32                 Type,\r
+  IN       EFI_TPL                NotifyTpl      OPTIONAL,\r
+  IN       EFI_EVENT_NOTIFY       NotifyFunction OPTIONAL,\r
+  IN CONST VOID                   *NotifyContext OPTIONAL,\r
+  IN CONST EFI_GUID               *EventGroup    OPTIONAL,\r
+  OUT      EFI_EVENT              *Event\r
   );\r
 \r
 typedef enum {\r
@@ -508,9 +466,9 @@ typedef enum {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_TIMER) (\r
-  IN EFI_EVENT                Event,\r
-  IN EFI_TIMER_DELAY          Type,\r
-  IN UINT64                   TriggerTime\r
+  IN  EFI_EVENT                Event,\r
+  IN  EFI_TIMER_DELAY          Type,\r
+  IN  UINT64                   TriggerTime\r
   );\r
 \r
 /**                                                                                                   \r
@@ -524,7 +482,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIGNAL_EVENT) (\r
-  IN EFI_EVENT                Event\r
+  IN  EFI_EVENT                Event\r
   );\r
 \r
 /**                                                                                                   \r
@@ -544,9 +502,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_WAIT_FOR_EVENT) (\r
-  IN UINTN                    NumberOfEvents,\r
-  IN EFI_EVENT                *Event,\r
-  OUT UINTN                   *Index\r
+  IN  UINTN                    NumberOfEvents,\r
+  IN  EFI_EVENT                *Event,\r
+  OUT UINTN                    *Index\r
   );\r
 \r
 /**                                                                                                   \r
@@ -650,11 +608,11 @@ VOID
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_GET_VARIABLE) (\r
-  IN CHAR16                       *VariableName,\r
-  IN EFI_GUID                     *VendorGuid,\r
-  OUT UINT32                      *Attributes,    OPTIONAL\r
-  IN OUT UINTN                    *DataSize,\r
-  OUT VOID                        *Data\r
+  IN     CHAR16                      *VariableName,\r
+  IN     EFI_GUID                    *VendorGuid,\r
+  OUT    UINT32                      *Attributes,    OPTIONAL\r
+  IN OUT UINTN                       *DataSize,\r
+  OUT    VOID                        *Data\r
   );\r
 \r
 /**                                                 \r
@@ -704,11 +662,11 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_VARIABLE) (\r
-  IN CHAR16                       *VariableName,\r
-  IN EFI_GUID                     *VendorGuid,\r
-  IN UINT32                       Attributes,\r
-  IN UINTN                        DataSize,\r
-  IN VOID                         *Data\r
+  IN  CHAR16                       *VariableName,\r
+  IN  EFI_GUID                     *VendorGuid,\r
+  IN  UINT32                       Attributes,\r
+  IN  UINTN                        DataSize,\r
+  IN  VOID                         *Data\r
   );\r
 \r
 //\r
@@ -736,8 +694,8 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_GET_TIME) (\r
-  OUT EFI_TIME                    *Time,\r
-  OUT EFI_TIME_CAPABILITIES       *Capabilities OPTIONAL\r
+  OUT  EFI_TIME                    *Time,\r
+  OUT  EFI_TIME_CAPABILITIES       *Capabilities OPTIONAL\r
   );\r
 \r
 /**                                                                 \r
@@ -753,7 +711,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_TIME) (\r
-  IN EFI_TIME                     *Time\r
+  IN  EFI_TIME                     *Time\r
   );\r
   \r
 /**                                                                 \r
@@ -792,8 +750,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_WAKEUP_TIME) (\r
-  IN BOOLEAN                      Enable,\r
-  IN EFI_TIME                     *Time   OPTIONAL\r
+  IN  BOOLEAN                      Enable,\r
+  IN  EFI_TIME                     *Time   OPTIONAL\r
   );\r
 \r
 /**                                                                 \r
@@ -809,8 +767,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_IMAGE_ENTRY_POINT) (\r
-  IN EFI_HANDLE                   ImageHandle,\r
-  IN EFI_SYSTEM_TABLE             *SystemTable\r
+  IN  EFI_HANDLE                   ImageHandle,\r
+  IN  EFI_SYSTEM_TABLE             *SystemTable\r
   );\r
 \r
 /**                                                                 \r
@@ -842,12 +800,12 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_IMAGE_LOAD) (\r
-  IN BOOLEAN                      BootPolicy,\r
-  IN EFI_HANDLE                   ParentImageHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *FilePath,\r
-  IN VOID                         *SourceBuffer OPTIONAL,\r
-  IN UINTN                        SourceSize,\r
-  OUT EFI_HANDLE                  *ImageHandle\r
+  IN  BOOLEAN                      BootPolicy,\r
+  IN  EFI_HANDLE                   ParentImageHandle,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL     *FilePath,\r
+  IN  VOID                         *SourceBuffer OPTIONAL,\r
+  IN  UINTN                        SourceSize,\r
+  OUT EFI_HANDLE                   *ImageHandle\r
   );\r
 \r
 /**                                                                 \r
@@ -866,7 +824,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_IMAGE_START) (\r
-  IN EFI_HANDLE                   ImageHandle,\r
+  IN  EFI_HANDLE                  ImageHandle,\r
   OUT UINTN                       *ExitDataSize,\r
   OUT CHAR16                      **ExitData    OPTIONAL\r
   );\r
@@ -889,10 +847,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EXIT) (\r
-  IN EFI_HANDLE                   ImageHandle,\r
-  IN EFI_STATUS                   ExitStatus,\r
-  IN UINTN                        ExitDataSize,\r
-  IN CHAR16                       *ExitData     OPTIONAL\r
+  IN  EFI_HANDLE                   ImageHandle,\r
+  IN  EFI_STATUS                   ExitStatus,\r
+  IN  UINTN                        ExitDataSize,\r
+  IN  CHAR16                       *ExitData     OPTIONAL\r
   );\r
 \r
 /**                                                                 \r
@@ -909,7 +867,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_IMAGE_UNLOAD) (\r
-  IN EFI_HANDLE                   ImageHandle\r
+  IN  EFI_HANDLE                   ImageHandle\r
   );\r
 \r
 /**                                                                 \r
@@ -925,8 +883,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_EXIT_BOOT_SERVICES) (\r
-  IN EFI_HANDLE                   ImageHandle,\r
-  IN UINTN                        MapKey\r
+  IN  EFI_HANDLE                   ImageHandle,\r
+  IN  UINTN                        MapKey\r
   );\r
 \r
 /**                                                                 \r
@@ -941,7 +899,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_STALL) (\r
-  IN UINTN                    Microseconds\r
+  IN  UINTN                    Microseconds\r
   );\r
 \r
 /**                                                                 \r
@@ -1113,10 +1071,10 @@ typedef enum {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INSTALL_PROTOCOL_INTERFACE) (\r
-  IN OUT EFI_HANDLE           *Handle,\r
-  IN EFI_GUID                 *Protocol,\r
-  IN EFI_INTERFACE_TYPE       InterfaceType,\r
-  IN VOID                     *Interface\r
+  IN OUT EFI_HANDLE               *Handle,\r
+  IN     EFI_GUID                 *Protocol,\r
+  IN     EFI_INTERFACE_TYPE       InterfaceType,\r
+  IN     VOID                     *Interface\r
   );\r
 \r
 /**                                                                 \r
@@ -1223,9 +1181,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_HANDLE_PROTOCOL) (\r
-  IN EFI_HANDLE               Handle,\r
-  IN EFI_GUID                 *Protocol,\r
-  OUT VOID                    **Interface\r
+  IN  EFI_HANDLE               Handle,\r
+  IN  EFI_GUID                 *Protocol,\r
+  OUT VOID                     **Interface\r
   );\r
 \r
 #define EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL  0x00000001\r
@@ -1265,8 +1223,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_OPEN_PROTOCOL) (\r
-  IN EFI_HANDLE                 Handle,\r
-  IN EFI_GUID                   *Protocol,\r
+  IN  EFI_HANDLE                Handle,\r
+  IN  EFI_GUID                  *Protocol,\r
   OUT VOID                      **Interface,\r
   IN  EFI_HANDLE                AgentHandle,\r
   IN  EFI_HANDLE                ControllerHandle, OPTIONAL\r
@@ -1355,7 +1313,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PROTOCOLS_PER_HANDLE) (\r
-  IN EFI_HANDLE       Handle,\r
+  IN  EFI_HANDLE      Handle,\r
   OUT EFI_GUID        ***ProtocolBuffer,\r
   OUT UINTN           *ProtocolBufferCount\r
   );\r
@@ -1376,9 +1334,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_REGISTER_PROTOCOL_NOTIFY) (\r
-  IN EFI_GUID                 *Protocol,\r
-  IN EFI_EVENT                Event,\r
-  OUT VOID                    **Registration\r
+  IN  EFI_GUID                 *Protocol,\r
+  IN  EFI_EVENT                Event,\r
+  OUT VOID                     **Registration\r
   );\r
 \r
 typedef enum {\r
@@ -1408,11 +1366,11 @@ typedef enum {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_LOCATE_HANDLE) (\r
-  IN EFI_LOCATE_SEARCH_TYPE   SearchType,\r
-  IN EFI_GUID                 *Protocol,    OPTIONAL\r
-  IN VOID                     *SearchKey,   OPTIONAL\r
-  IN OUT UINTN                *BufferSize,\r
-  OUT EFI_HANDLE              *Buffer\r
+  IN     EFI_LOCATE_SEARCH_TYPE   SearchType,\r
+  IN     EFI_GUID                 *Protocol,    OPTIONAL\r
+  IN     VOID                     *SearchKey,   OPTIONAL\r
+  IN OUT UINTN                    *BufferSize,\r
+  OUT    EFI_HANDLE               *Buffer\r
   );\r
 \r
 /**                                                                 \r
@@ -1432,9 +1390,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_LOCATE_DEVICE_PATH) (\r
-  IN EFI_GUID                         *Protocol,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath,\r
-  OUT EFI_HANDLE                      *Device\r
+  IN     EFI_GUID                         *Protocol,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL         **DevicePath,\r
+  OUT    EFI_HANDLE                       *Device\r
   );\r
 \r
 /**                                                                 \r
@@ -1489,11 +1447,11 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_LOCATE_HANDLE_BUFFER) (\r
-  IN EFI_LOCATE_SEARCH_TYPE       SearchType,\r
-  IN EFI_GUID                     *Protocol,      OPTIONAL\r
-  IN VOID                         *SearchKey,     OPTIONAL\r
-  IN OUT UINTN                    *NoHandles,\r
-  OUT EFI_HANDLE                  **Buffer\r
+  IN     EFI_LOCATE_SEARCH_TYPE       SearchType,\r
+  IN     EFI_GUID                     *Protocol,      OPTIONAL\r
+  IN     VOID                         *SearchKey,     OPTIONAL\r
+  IN OUT UINTN                        *NoHandles,\r
+  OUT    EFI_HANDLE                   **Buffer\r
   );\r
 \r
 /**                                                                 \r
@@ -1515,12 +1473,11 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_LOCATE_PROTOCOL) (\r
-  IN EFI_GUID  *Protocol,\r
-  IN VOID      *Registration, OPTIONAL\r
+  IN  EFI_GUID  *Protocol,\r
+  IN  VOID      *Registration, OPTIONAL\r
   OUT VOID      **Interface\r
   );\r
 \r
-\r
 typedef struct {\r
   UINT64                            Length;\r
   union {\r
@@ -1530,13 +1487,13 @@ typedef struct {
 } UEFI_CAPSULE_BLOCK_DESCRIPTOR;\r
 \r
 typedef struct {\r
-  EFI_GUID    CapsuleGuid;\r
+  EFI_GUID          CapsuleGuid;\r
   UINT32            HeaderSize;\r
   UINT32            Flags;\r
   UINT32            CapsuleImageSize;\r
 } UEFI_CAPSULE_HEADER;\r
 \r
-#define CAPSULE_FLAGS_PERSIST_ACROSS_RESET        0x00010000\r
+#define CAPSULE_FLAGS_PERSIST_ACROSS_RESET          0x00010000\r
 #define CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE         0x00020000\r
 \r
 /**                                                                 \r
@@ -1590,10 +1547,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_QUERY_CAPSULE_CAPABILITIES) (\r
-  IN UEFI_CAPSULE_HEADER    **CapsuleHeaderArray,\r
-  IN UINTN                  CapsuleCount,\r
-  OUT   UINT64              *MaximumCapsuleSize,\r
-  OUT EFI_RESET_TYPE        *ResetType\r
+  IN  UEFI_CAPSULE_HEADER    **CapsuleHeaderArray,\r
+  IN  UINTN                  CapsuleCount,\r
+  OUT UINT64                 *MaximumCapsuleSize,\r
+  OUT EFI_RESET_TYPE         *ResetType\r
   );\r
 \r
 /**                                                                                                    \r
@@ -1621,9 +1578,9 @@ EFI_STATUS
 typedef                         \r
 EFI_STATUS\r
 (EFIAPI *EFI_QUERY_VARIABLE_INFO) (\r
-  IN UINT32           Attributes,\r
+  IN  UINT32            Attributes,\r
   OUT UINT64            *MaximumVariableStorageSize,\r
-  OUT    UINT64         *RemainingVariableStorageSize,\r
+  OUT UINT64            *RemainingVariableStorageSize,\r
   OUT UINT64            *MaximumVariableSize\r
   );\r
 \r
@@ -1691,7 +1648,7 @@ typedef struct {
   //  It was moved to a protocol to not conflict with UEFI 2.0\r
   //  If Tiano is disabled this item is not enabled for EFI 1.10\r
   //\r
-  TIANO_REPORT_STATUS_CODE          ReportStatusCode;\r
+  TIANO_REPORT_STATUS_CODE        ReportStatusCode;\r
 #endif\r
 } EFI_RUNTIME_SERVICES;\r
 \r
@@ -1988,7 +1945,7 @@ typedef struct {
     UINT8                         DeviceProtocol;\r
 } USB_CLASS_DEVICE_PATH;\r
 \r
-#define MSG_USB_WWID_DP          0x10\r
+#define MSG_USB_WWID_DP           0x10\r
 typedef struct {\r
     EFI_DEVICE_PATH_PROTOCOL      Header;\r
     UINT16                        InterfaceNumber;\r
@@ -2152,7 +2109,7 @@ typedef struct {
 // and we moved to a new GUID'ed device path for Tiano\r
 //\r
 \r
-#define MEDIA_FV_FILEPATH_DP  0x06\r
+#define MEDIA_FV_FILEPATH_DP      0x06\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
   EFI_GUID                  NameGuid;\r
@@ -2453,7 +2410,6 @@ typedef enum {
 #include <Protocol/Hash.h>\r
 \r
 #include <Guid/EventGroup.h>\r
-//#include <Guid/WinCertificateUefi.h>\r
 #endif\r
 \r
 \r