MdeModulePkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

43 files changed, 454 insertions, 486 deletions

diff --git a/MdeModulePkg/Include/Protocol/AtaAtapiPolicy.h b/MdeModulePkg/Include/Protocol/AtaAtapiPolicy.h
index 5013eef..1b8a453 100644
--- a/MdeModulePkg/Include/Protocol/AtaAtapiPolicy.h
+++ b/MdeModulePkg/Include/Protocol/AtaAtapiPolicy.h
@@ -6,6 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

+

 #ifndef __ATA_ATAPI_POLICY_H__

 #define __ATA_ATAPI_POLICY_H__

 

@@ -18,36 +19,34 @@ typedef struct {
   ///

   /// Protocol version.

   ///

-  UINT32  Version;

+  UINT32    Version;

 

   ///

   /// 0: Disable Power-up in Standby;

   /// 1: Enable Power-up in Standby;

   /// others: Since PUIS setting is non-volatile, platform can use other value than 0/1 to keep hardware PUIS setting.

   ///

-  UINT8   PuisEnable;

+  UINT8     PuisEnable;

 

   ///

   /// 0: Disable Device Sleep;

   /// 1: Enable Device Sleep;

   /// others: Ignored.

   ///

-  UINT8   DeviceSleepEnable;

+  UINT8     DeviceSleepEnable;

 

   ///

   /// 0: Disable Aggressive Device Sleep;

   /// 1: Enable Aggressive Device Sleep;

   /// others: Ignored.

   ///

-  UINT8   AggressiveDeviceSleepEnable;

+  UINT8     AggressiveDeviceSleepEnable;

 

-  UINT8   Reserved;

+  UINT8     Reserved;

 } EDKII_ATA_ATAPI_POLICY_PROTOCOL;

 

-#define EDKII_ATA_ATAPI_POLICY_VERSION 0x00010000

-

+#define EDKII_ATA_ATAPI_POLICY_VERSION  0x00010000

 

-extern EFI_GUID gEdkiiAtaAtapiPolicyProtocolGuid;

+extern EFI_GUID  gEdkiiAtaAtapiPolicyProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/BootLogo.h b/MdeModulePkg/Include/Protocol/BootLogo.h
index 5dfd784..94a9cd1 100644
--- a/MdeModulePkg/Include/Protocol/BootLogo.h
+++ b/MdeModulePkg/Include/Protocol/BootLogo.h
@@ -19,7 +19,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EFI_BOOT_LOGO_PROTOCOL  EFI_BOOT_LOGO_PROTOCOL;

+typedef struct _EFI_BOOT_LOGO_PROTOCOL EFI_BOOT_LOGO_PROTOCOL;

 

 /**

   Update information of logo image drawn on screen.

@@ -51,9 +51,9 @@ EFI_STATUS
   );

 

 struct _EFI_BOOT_LOGO_PROTOCOL {

-  EFI_SET_BOOT_LOGO        SetBootLogo;

+  EFI_SET_BOOT_LOGO    SetBootLogo;

 };

 

-extern EFI_GUID gEfiBootLogoProtocolGuid;

+extern EFI_GUID  gEfiBootLogoProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/BootLogo2.h b/MdeModulePkg/Include/Protocol/BootLogo2.h
index b7b52d1..8542d00 100644
--- a/MdeModulePkg/Include/Protocol/BootLogo2.h
+++ b/MdeModulePkg/Include/Protocol/BootLogo2.h
@@ -92,8 +92,8 @@ EFI_STATUS
   );

 

 struct _EDKII_BOOT_LOGO2_PROTOCOL {

-  EDKII_SET_BOOT_LOGO2  SetBootLogo;

-  EDKII_GET_BOOT_LOGO2  GetBootLogo;

+  EDKII_SET_BOOT_LOGO2    SetBootLogo;

+  EDKII_GET_BOOT_LOGO2    GetBootLogo;

 };

 

 extern EFI_GUID  gEdkiiBootLogo2ProtocolGuid;

diff --git a/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h b/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h
index d91c90b..6db5b75 100644
--- a/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h
+++ b/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h
@@ -16,10 +16,10 @@
 #define EFI_DEBUGGER_CONFIGURATION_VERSION  0x00000001

 

 typedef struct _EFI_DEBUGGER_CONFIGURATION_PROTOCOL {

-  UINT32                      DebuggerConfigurationRevision;

-  VOID                        *DebuggerPrivateData;

+  UINT32    DebuggerConfigurationRevision;

+  VOID      *DebuggerPrivateData;

 } EFI_DEBUGGER_CONFIGURATION_PROTOCOL;

 

-extern EFI_GUID gEfiDebuggerConfigurationProtocolGuid;

+extern EFI_GUID  gEfiDebuggerConfigurationProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/DeviceSecurity.h b/MdeModulePkg/Include/Protocol/DeviceSecurity.h
index c3bf624..7492d42 100644
--- a/MdeModulePkg/Include/Protocol/DeviceSecurity.h
+++ b/MdeModulePkg/Include/Protocol/DeviceSecurity.h
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #ifndef __DEVICE_SECURITY_H__

 #define __DEVICE_SECURITY_H__

 

@@ -24,14 +23,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EDKII_DEVICE_SECURITY_PROTOCOL  EDKII_DEVICE_SECURITY_PROTOCOL;

+typedef struct _EDKII_DEVICE_SECURITY_PROTOCOL EDKII_DEVICE_SECURITY_PROTOCOL;

 

 //

 // Revision The revision to which the DEVICE_SECURITY interface adheres.

 //          All future revisions must be backwards compatible.

 //          If a future version is not back wards compatible it is not the same GUID.

 //

-#define EDKII_DEVICE_SECURITY_PROTOCOL_REVISION 0x00010000

+#define EDKII_DEVICE_SECURITY_PROTOCOL_REVISION  0x00010000

 

 //

 // The device identifier.

@@ -40,7 +39,7 @@ typedef struct {
   ///

   /// Version of this data structure.

   ///

-  UINT32                Version;

+  UINT32    Version;

   ///

   /// Type of the device.

   /// This field is also served as a device Access protocol GUID.

@@ -49,7 +48,7 @@ typedef struct {
   ///   EDKII_DEVICE_IDENTIFIER_TYPE_PCI_GUID means the device access protocol is PciIo.

   ///   EDKII_DEVICE_IDENTIFIER_TYPE_USB_GUID means the device access protocol is UsbIo.

   ///

-  EFI_GUID              DeviceType;

+  EFI_GUID    DeviceType;

   ///

   /// The handle created for this device.

   /// NOTE: This might be a temporary handle.

@@ -72,14 +71,14 @@ typedef struct {
   ///       register a protocol notify function. Installing a real protocol may cause

   ///       the callback function being executed before the device is authenticated.

   ///

-  EFI_HANDLE            DeviceHandle;

+  EFI_HANDLE    DeviceHandle;

 } EDKII_DEVICE_IDENTIFIER;

 

 //

 // Revision The revision to which the DEVICE_IDENTIFIER interface adheres.

 //          All future revisions must be backwards compatible.

 //

-#define EDKII_DEVICE_IDENTIFIER_REVISION 0x00010000

+#define EDKII_DEVICE_IDENTIFIER_REVISION  0x00010000

 

 //

 // Device Identifier GUID value

@@ -144,19 +143,19 @@ EFI_STATUS
 /// This protocol is used to authenticate a device based upon the platform policy.

 ///

 struct _EDKII_DEVICE_SECURITY_PROTOCOL {

-  UINT64                              Revision;

-  EDKII_DEVICE_AUTHENTICATE           DeviceAuthenticate;

+  UINT64                       Revision;

+  EDKII_DEVICE_AUTHENTICATE    DeviceAuthenticate;

 };

 

 ///

 /// Device Security Protocol GUID variable.

 ///

-extern EFI_GUID gEdkiiDeviceSecurityProtocolGuid;

+extern EFI_GUID  gEdkiiDeviceSecurityProtocolGuid;

 

 ///

 /// Device Identifier tpye GUID variable.

 ///

-extern EFI_GUID gEdkiiDeviceIdentifierTypePciGuid;

-extern EFI_GUID gEdkiiDeviceIdentifierTypeUsbGuid;

+extern EFI_GUID  gEdkiiDeviceIdentifierTypePciGuid;

+extern EFI_GUID  gEdkiiDeviceIdentifierTypeUsbGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/DisplayProtocol.h b/MdeModulePkg/Include/Protocol/DisplayProtocol.h
index 748ceed..be08b74 100644
--- a/MdeModulePkg/Include/Protocol/DisplayProtocol.h
+++ b/MdeModulePkg/Include/Protocol/DisplayProtocol.h
@@ -17,11 +17,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Do nothing.

 //

-#define BROWSER_ACTION_NONE         BIT16

+#define BROWSER_ACTION_NONE  BIT16

 //

 // ESC Exit

 //

-#define BROWSER_ACTION_FORM_EXIT    BIT17

+#define BROWSER_ACTION_FORM_EXIT  BIT17

 

 #define BROWSER_SUCCESS                   0x0

 #define BROWSER_ERROR                     BIT31

@@ -44,53 +44,53 @@ typedef struct {
   //

   // HII Data Type

   //

-  UINT8               Type;

+  UINT8                 Type;

   //

   // Buffer Data and Length if Type is EFI_IFR_TYPE_BUFFER or EFI_IFR_TYPE_STRING

   //

-  UINT8               *Buffer;

-  UINT16              BufferLen;

-  EFI_IFR_TYPE_VALUE  Value;

+  UINT8                 *Buffer;

+  UINT16                BufferLen;

+  EFI_IFR_TYPE_VALUE    Value;

 } EFI_HII_VALUE;

 

 #define DISPLAY_QUESTION_OPTION_SIGNATURE  SIGNATURE_32 ('Q', 'O', 'P', 'T')

 

 typedef struct {

-  UINTN                  Signature;

-  LIST_ENTRY             Link;

+  UINTN                    Signature;

+  LIST_ENTRY               Link;

   //

   // OneOfOption Data

   //

-  EFI_IFR_ONE_OF_OPTION  *OptionOpCode;

+  EFI_IFR_ONE_OF_OPTION    *OptionOpCode;

   //

   // Option ImageId and AnimationId

   //

-  EFI_IMAGE_ID           ImageId;

-  EFI_ANIMATION_ID       AnimationId;

+  EFI_IMAGE_ID             ImageId;

+  EFI_ANIMATION_ID         AnimationId;

 } DISPLAY_QUESTION_OPTION;

 

 #define DISPLAY_QUESTION_OPTION_FROM_LINK(a)  CR (a, DISPLAY_QUESTION_OPTION, Link, DISPLAY_QUESTION_OPTION_SIGNATURE)

 

-typedef struct _FORM_DISPLAY_ENGINE_STATEMENT FORM_DISPLAY_ENGINE_STATEMENT;

-typedef struct _FORM_DISPLAY_ENGINE_FORM      FORM_DISPLAY_ENGINE_FORM;

+typedef struct _FORM_DISPLAY_ENGINE_STATEMENT  FORM_DISPLAY_ENGINE_STATEMENT;

+typedef struct _FORM_DISPLAY_ENGINE_FORM       FORM_DISPLAY_ENGINE_FORM;

 

-#define STATEMENT_VALID             0x0

-#define STATEMENT_INVALID           BIT31

+#define STATEMENT_VALID    0x0

+#define STATEMENT_INVALID  BIT31

 

-#define INCOSISTENT_IF_TRUE         STATEMENT_INVALID | 0x01

-#define WARNING_IF_TRUE             STATEMENT_INVALID | 0x02

-#define STRING_TOO_LONG             STATEMENT_INVALID | 0x03

+#define INCOSISTENT_IF_TRUE  STATEMENT_INVALID | 0x01

+#define WARNING_IF_TRUE      STATEMENT_INVALID | 0x02

+#define STRING_TOO_LONG      STATEMENT_INVALID | 0x03

 // ... to be extended.

 

 typedef struct {

   //

   // StringId for INCONSITENT_IF or WARNING_IF

   //

-  EFI_STRING_ID  StringId;

+  EFI_STRING_ID    StringId;

   //

   // TimeOut for WARNING_IF

   //

-  UINT8          TimeOut;

+  UINT8            TimeOut;

 } STATEMENT_ERROR_INFO;

 

 /**

@@ -105,7 +105,7 @@ typedef struct {
 **/

 typedef

 UINT32

-(EFIAPI *VALIDATE_QUESTION) (

+(EFIAPI *VALIDATE_QUESTION)(

   IN FORM_DISPLAY_ENGINE_FORM      *Form,

   IN FORM_DISPLAY_ENGINE_STATEMENT *Statement,

   IN EFI_HII_VALUE                 *Value,

@@ -126,7 +126,7 @@ UINT32
 **/

 typedef

 EFI_STATUS

-(EFIAPI *PASSWORD_CHECK) (

+(EFIAPI *PASSWORD_CHECK)(

   IN FORM_DISPLAY_ENGINE_FORM      *Form,

   IN FORM_DISPLAY_ENGINE_STATEMENT *Statement,

   IN EFI_STRING                    PasswordString  OPTIONAL

@@ -137,66 +137,66 @@ EFI_STATUS
 //

 // Attribute for Statement and Form

 //

-#define HII_DISPLAY_NONE             0

-#define HII_DISPLAY_GRAYOUT          BIT0

-#define HII_DISPLAY_LOCK             BIT1

-#define HII_DISPLAY_READONLY         BIT2

-#define HII_DISPLAY_MODAL            BIT3

-#define HII_DISPLAY_SUPPRESS         BIT4

-

-struct _FORM_DISPLAY_ENGINE_STATEMENT{

-  UINTN                 Signature;

+#define HII_DISPLAY_NONE      0

+#define HII_DISPLAY_GRAYOUT   BIT0

+#define HII_DISPLAY_LOCK      BIT1

+#define HII_DISPLAY_READONLY  BIT2

+#define HII_DISPLAY_MODAL     BIT3

+#define HII_DISPLAY_SUPPRESS  BIT4

+

+struct _FORM_DISPLAY_ENGINE_STATEMENT {

+  UINTN                Signature;

   //

   // Version for future structure extension

   //

-  UINTN                 Version;

+  UINTN                Version;

   //

   // link to all the statement which will show in the display form.

   //

-  LIST_ENTRY            DisplayLink;

+  LIST_ENTRY           DisplayLink;

   //

   // Pointer to statement opcode.

   // for Guided Opcode. All buffers will be here if GUIDED opcode scope is set.

   //

-  EFI_IFR_OP_HEADER     *OpCode;

+  EFI_IFR_OP_HEADER    *OpCode;

   //

   // Question CurrentValue

   //

-  EFI_HII_VALUE         CurrentValue;

+  EFI_HII_VALUE        CurrentValue;

   //

   // Flag to describe whether setting is changed or not.

   // Displayer may depend on it to show it with the different color.

   //

-  BOOLEAN               SettingChangedFlag;

+  BOOLEAN              SettingChangedFlag;

   //

   // nested Statement list inside of EFI_IFR_SUBTITLE

   //

-  LIST_ENTRY            NestStatementList;

+  LIST_ENTRY           NestStatementList;

   //

   // nested EFI_IFR_ONE_OF_OPTION list (QUESTION_OPTION)

   //

-  LIST_ENTRY            OptionListHead;

+  LIST_ENTRY           OptionListHead;

   //

   // Statement attributes: GRAYOUT, LOCK and READONLY

   //

-  UINT32                Attribute;

+  UINT32               Attribute;

 

   //

   // ValidateQuestion to do InconsistIf check

   // It may be NULL if any value is valid.

   //

-  VALIDATE_QUESTION     ValidateQuestion;

+  VALIDATE_QUESTION    ValidateQuestion;

 

   //

   // Password additional check. It may be NULL when the additional check is not required.

   //

-  PASSWORD_CHECK        PasswordCheck;

+  PASSWORD_CHECK       PasswordCheck;

 

   //

   // Statement ImageId and AnimationId

   //

-  EFI_IMAGE_ID          ImageId;

-  EFI_ANIMATION_ID      AnimationId;

+  EFI_IMAGE_ID         ImageId;

+  EFI_ANIMATION_ID     AnimationId;

 };

 

 #define FORM_DISPLAY_ENGINE_STATEMENT_FROM_LINK(a)  CR (a, FORM_DISPLAY_ENGINE_STATEMENT, DisplayLink, FORM_DISPLAY_ENGINE_STATEMENT_SIGNATURE)

@@ -204,19 +204,19 @@ struct _FORM_DISPLAY_ENGINE_STATEMENT{
 #define BROWSER_HOT_KEY_SIGNATURE  SIGNATURE_32 ('B', 'H', 'K', 'S')

 

 typedef struct {

-  UINTN                 Signature;

-  LIST_ENTRY            Link;

+  UINTN            Signature;

+  LIST_ENTRY       Link;

 

-  EFI_INPUT_KEY         *KeyData;

+  EFI_INPUT_KEY    *KeyData;

   //

   // Action is Discard, Default, Submit, Reset and Exit.

   //

-  UINT32                 Action;

-  UINT16                 DefaultId;

+  UINT32           Action;

+  UINT16           DefaultId;

   //

   // HotKey Help String

   //

-  EFI_STRING             HelpString;

+  EFI_STRING       HelpString;

 } BROWSER_HOT_KEY;

 

 #define BROWSER_HOT_KEY_FROM_LINK(a)  CR (a, BROWSER_HOT_KEY, Link, BROWSER_HOT_KEY_SIGNATURE)

@@ -224,86 +224,86 @@ typedef struct {
 #define FORM_DISPLAY_ENGINE_FORM_SIGNATURE  SIGNATURE_32 ('F', 'F', 'R', 'M')

 

 struct _FORM_DISPLAY_ENGINE_FORM {

-  UINTN                Signature;

+  UINTN                            Signature;

   //

   // Version for future structure extension

   //

-  UINTN                Version;

+  UINTN                            Version;

   //

   // Statement List inside of Form

   //

-  LIST_ENTRY            StatementListHead;

+  LIST_ENTRY                       StatementListHead;

   //

   // Statement List outside of Form

   //

-  LIST_ENTRY            StatementListOSF;

+  LIST_ENTRY                       StatementListOSF;

   //

   // The input screen dimenstions info.

   //

-  EFI_SCREEN_DESCRIPTOR *ScreenDimensions;

+  EFI_SCREEN_DESCRIPTOR            *ScreenDimensions;

   //

   // FormSet information

   //

-  EFI_GUID             FormSetGuid;

+  EFI_GUID                         FormSetGuid;

   //

   // HiiHandle can be used to get String, Image or Animation

   //

-  EFI_HII_HANDLE       HiiHandle;

+  EFI_HII_HANDLE                   HiiHandle;

 

   //

   // Form ID and Title.

   //

-  UINT16               FormId;

-  EFI_STRING_ID        FormTitle;

+  UINT16                           FormId;

+  EFI_STRING_ID                    FormTitle;

   //

   // Form Attributes: Lock, Modal.

   //

-  UINT32               Attribute;

+  UINT32                           Attribute;

   //

   // Flag to describe whether setting is changed or not.

   // Displayer depends on it to show ChangedFlag.

   //

-  BOOLEAN              SettingChangedFlag;

+  BOOLEAN                          SettingChangedFlag;

 

   //

   // Statement to be HighLighted

   //

-  FORM_DISPLAY_ENGINE_STATEMENT *HighLightedStatement;

+  FORM_DISPLAY_ENGINE_STATEMENT    *HighLightedStatement;

   //

   // Event to notify Displayer that FormData is updated to be refreshed.

   //

-  EFI_EVENT              FormRefreshEvent;

+  EFI_EVENT                        FormRefreshEvent;

   //

   // Additional Hotkey registered by BrowserEx protocol.

   //

-  LIST_ENTRY             HotKeyListHead;

+  LIST_ENTRY                       HotKeyListHead;

 

   //

   // Form ImageId and AnimationId

   //

-  EFI_IMAGE_ID         ImageId;

-  EFI_ANIMATION_ID     AnimationId;

+  EFI_IMAGE_ID                     ImageId;

+  EFI_ANIMATION_ID                 AnimationId;

 

   //

   // If Status is error, display needs to handle it.

   //

-  UINT32               BrowserStatus;

+  UINT32                           BrowserStatus;

   //

   // String for error status. It may be NULL.

   //

-  EFI_STRING           ErrorString;

+  EFI_STRING                       ErrorString;

 };

 

 #define FORM_DISPLAY_ENGINE_FORM_FROM_LINK(a)  CR (a, FORM_DISPLAY_ENGINE_FORM, Link, FORM_DISPLAY_ENGINE_FORM_SIGNATURE)

 

 typedef struct {

-  FORM_DISPLAY_ENGINE_STATEMENT  *SelectedStatement; // Selected Statement and InputValue

+  FORM_DISPLAY_ENGINE_STATEMENT    *SelectedStatement; // Selected Statement and InputValue

 

-  EFI_HII_VALUE                  InputValue;

+  EFI_HII_VALUE                    InputValue;

 

-  UINT32                         Action;             // If SelectedStatement is NULL, Action will be used.

+  UINT32                           Action;           // If SelectedStatement is NULL, Action will be used.

                                                      // Trig Action (Discard, Default, Submit, Reset and Exit)

-  UINT16                         DefaultId;

+  UINT16                           DefaultId;

 } USER_INPUT;

 

 /**

@@ -316,10 +316,10 @@ typedef struct {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *FORM_DISPLAY) (

+(EFIAPI *FORM_DISPLAY)(

   IN FORM_DISPLAY_ENGINE_FORM  *FormData,

   OUT USER_INPUT               *UserInputData

-);

+  );

 

 /**

   Exit Display and Clear Screen to the original state.

@@ -327,9 +327,9 @@ EFI_STATUS
 **/

 typedef

 VOID

-(EFIAPI *EXIT_DISPLAY) (

+(EFIAPI *EXIT_DISPLAY)(

   VOID

-);

+  );

 

 /**

   Confirm how to handle the changed data.

@@ -338,15 +338,15 @@ VOID
 **/

 typedef

 UINTN

-(EFIAPI *CONFIRM_DATA_CHANGE) (

+(EFIAPI *CONFIRM_DATA_CHANGE)(

   VOID

-);

+  );

 

 typedef struct {

-  FORM_DISPLAY        FormDisplay;

-  EXIT_DISPLAY        ExitDisplay;

-  CONFIRM_DATA_CHANGE ConfirmDataChange;

+  FORM_DISPLAY           FormDisplay;

+  EXIT_DISPLAY           ExitDisplay;

+  CONFIRM_DATA_CHANGE    ConfirmDataChange;

 } EDKII_FORM_DISPLAY_ENGINE_PROTOCOL;

 

-extern EFI_GUID gEdkiiFormDisplayEngineProtocolGuid;

+extern EFI_GUID  gEdkiiFormDisplayEngineProtocolGuid;

 #endif

diff --git a/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h b/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
index bb25782..503c4ae 100644
--- a/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
+++ b/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
@@ -36,7 +36,7 @@ typedef struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL EFI_EBC_SIMPLE_DEBUGGER_PROTOCO
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EBC_DEBUGGER_SIGNAL_EXCEPTION) (

+(EFIAPI *EBC_DEBUGGER_SIGNAL_EXCEPTION)(

   IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,

   IN VM_CONTEXT                                 *VmPtr,

   IN EFI_EXCEPTION_TYPE                         ExceptionType

@@ -54,7 +54,7 @@ EFI_STATUS
 **/

 typedef

 VOID

-(EFIAPI *EBC_DEBUGGER_DEBUG) (

+(EFIAPI *EBC_DEBUGGER_DEBUG)(

   IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,

   IN VM_CONTEXT                                 *VmPtr

   );

@@ -73,7 +73,7 @@ VOID
 **/

 typedef

 UINT32

-(EFIAPI *EBC_DEBUGGER_DASM) (

+(EFIAPI *EBC_DEBUGGER_DASM)(

   IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,

   IN VM_CONTEXT                                 *VmPtr,

   IN UINT16                                     *DasmString OPTIONAL,

@@ -96,7 +96,7 @@ UINT32
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EBC_DEBUGGER_CONFIGURE) (

+(EFIAPI *EBC_DEBUGGER_CONFIGURE)(

   IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL           *This,

   IN UINT32                                     ConfigId,

   IN UINTN                                      ConfigValue

@@ -106,12 +106,12 @@ EFI_STATUS
 // Prototype for the actual EBC debug support protocol interface

 //

 struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL {

-  EBC_DEBUGGER_DEBUG            Debugger;

-  EBC_DEBUGGER_SIGNAL_EXCEPTION SignalException;

-  EBC_DEBUGGER_DASM             Dasm;

-  EBC_DEBUGGER_CONFIGURE        Configure;

+  EBC_DEBUGGER_DEBUG               Debugger;

+  EBC_DEBUGGER_SIGNAL_EXCEPTION    SignalException;

+  EBC_DEBUGGER_DASM                Dasm;

+  EBC_DEBUGGER_CONFIGURE           Configure;

 };

 

-extern EFI_GUID gEfiEbcSimpleDebuggerProtocolGuid;

+extern EFI_GUID  gEfiEbcSimpleDebuggerProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/EbcVmTest.h b/MdeModulePkg/Include/Protocol/EbcVmTest.h
index 55628a2..a4ed489 100644
--- a/MdeModulePkg/Include/Protocol/EbcVmTest.h
+++ b/MdeModulePkg/Include/Protocol/EbcVmTest.h
@@ -40,16 +40,16 @@ typedef struct _EFI_EBC_VM_TEST_PROTOCOL EFI_EBC_VM_TEST_PROTOCOL;
 //

 // Masks for working with the VM flags register

 //

-#define VMFLAGS_CC        0x0001  // condition flag

-#define VMFLAGS_STEP      0x0002  // step instruction mode

-#define VMFLAGS_ALL_VALID (VMFLAGS_CC | VMFLAGS_STEP)

+#define VMFLAGS_CC         0x0001 // condition flag

+#define VMFLAGS_STEP       0x0002 // step instruction mode

+#define VMFLAGS_ALL_VALID  (VMFLAGS_CC | VMFLAGS_STEP)

 

 //

 // Macros for operating on the VM flags register

 //

-#define VMFLAG_SET(pVM, Flag)   (pVM->Flags |= (Flag))

-#define VMFLAG_ISSET(pVM, Flag) ((pVM->Flags & (Flag)) ? 1 : 0)

-#define VMFLAG_CLEAR(pVM, Flag) (pVM->Flags &= ~(Flag))

+#define VMFLAG_SET(pVM, Flag)    (pVM->Flags |= (Flag))

+#define VMFLAG_ISSET(pVM, Flag)  ((pVM->Flags & (Flag)) ? 1 : 0)

+#define VMFLAG_CLEAR(pVM, Flag)  (pVM->Flags &= ~(Flag))

 

 //

 // Define a macro to get the operand. Then we can change it to be either a

@@ -61,8 +61,8 @@ typedef struct _EFI_EBC_VM_TEST_PROTOCOL EFI_EBC_VM_TEST_PROTOCOL;
 //

 // Macros for operating on the VM GP registers

 //

-#define OPERAND1_REGDATA(pVM, Op) pVM->Gpr[OPERAND1_REGNUM (Op)]

-#define OPERAND2_REGDATA(pVM, Op) pVM->Gpr[OPERAND2_REGNUM (Op)]

+#define OPERAND1_REGDATA(pVM, Op)  pVM->Gpr[OPERAND1_REGNUM (Op)]

+#define OPERAND2_REGDATA(pVM, Op)  pVM->Gpr[OPERAND2_REGNUM (Op)]

 

 //

 // Bits of exception flags field of VM context

@@ -75,35 +75,35 @@ typedef struct _EFI_EBC_VM_TEST_PROTOCOL EFI_EBC_VM_TEST_PROTOCOL;
 ///

 /// instruction pointer for the VM

 ///

-typedef UINT8   *VMIP;

+typedef UINT8 *VMIP;

 

-typedef INT64   VM_REGISTER;

-typedef UINT32  EXCEPTION_FLAGS;

+typedef INT64  VM_REGISTER;

+typedef UINT32 EXCEPTION_FLAGS;

 

 typedef struct {

-  VM_REGISTER       Gpr[8];                 ///< General purpose registers.

+  VM_REGISTER         Gpr[8];               ///< General purpose registers.

                                             ///< Flags register:

                                             ///<   0  Set to 1 if the result of the last compare was true

                                             ///<   1  Set to 1 if stepping

-  UINT64            Flags;                  ///<   2..63 Reserved.

-  VMIP              Ip;                     ///< Instruction pointer.

-  UINTN             LastException;

-  EXCEPTION_FLAGS   ExceptionFlags;         ///< to keep track of exceptions

-  UINT32            StopFlags;

-  UINT32            CompilerVersion;        ///< via break(6)

-  UINTN             HighStackBottom;        ///< bottom of the upper stack

-  UINTN             LowStackTop;            ///< top of the lower stack

-  UINT64            StackRetAddr;           ///< location of final return address on stack

-  UINTN             *StackMagicPtr;         ///< pointer to magic value on stack to detect corruption

-  EFI_HANDLE        ImageHandle;            ///< for this EBC driver

-  EFI_SYSTEM_TABLE  *SystemTable;           ///< for debugging only

-  UINTN             LastAddrConverted;      ///< for debug

-  UINTN             LastAddrConvertedValue; ///< for debug

-  VOID              *FramePtr;

-  VOID              *EntryPoint;            ///< entry point of EBC image

-  UINTN             ImageBase;

-  VOID              *StackPool;

-  VOID              *StackTop;

+  UINT64              Flags;                ///<   2..63 Reserved.

+  VMIP                Ip;                   ///< Instruction pointer.

+  UINTN               LastException;

+  EXCEPTION_FLAGS     ExceptionFlags;       ///< to keep track of exceptions

+  UINT32              StopFlags;

+  UINT32              CompilerVersion;        ///< via break(6)

+  UINTN               HighStackBottom;        ///< bottom of the upper stack

+  UINTN               LowStackTop;            ///< top of the lower stack

+  UINT64              StackRetAddr;           ///< location of final return address on stack

+  UINTN               *StackMagicPtr;         ///< pointer to magic value on stack to detect corruption

+  EFI_HANDLE          ImageHandle;            ///< for this EBC driver

+  EFI_SYSTEM_TABLE    *SystemTable;           ///< for debugging only

+  UINTN               LastAddrConverted;      ///< for debug

+  UINTN               LastAddrConvertedValue; ///< for debug

+  VOID                *FramePtr;

+  VOID                *EntryPoint;          ///< entry point of EBC image

+  UINTN               ImageBase;

+  VOID                *StackPool;

+  VOID                *StackTop;

 } VM_CONTEXT;

 

 /**

@@ -122,7 +122,7 @@ typedef struct {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EBC_VM_TEST_EXECUTE) (

+(EFIAPI *EBC_VM_TEST_EXECUTE)(

   IN EFI_EBC_VM_TEST_PROTOCOL         *This,

   IN VM_CONTEXT                       *VmPtr,

   IN OUT UINTN                        *InstructionCount

@@ -142,7 +142,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EBC_VM_TEST_ASM) (

+(EFIAPI *EBC_VM_TEST_ASM)(

   IN EFI_EBC_VM_TEST_PROTOCOL         *This,

   IN CHAR16                           *AsmText,

   IN OUT INT8                         *Buffer,

@@ -163,7 +163,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EBC_VM_TEST_DASM) (

+(EFIAPI *EBC_VM_TEST_DASM)(

   IN EFI_EBC_VM_TEST_PROTOCOL         *This,

   IN OUT CHAR16                       *AsmText,

   IN OUT INT8                         *Buffer,

@@ -174,11 +174,11 @@ EFI_STATUS
 // Prototype for the actual EBC test protocol interface

 //

 struct _EFI_EBC_VM_TEST_PROTOCOL {

-  EBC_VM_TEST_EXECUTE Execute;

-  EBC_VM_TEST_ASM     Assemble;

-  EBC_VM_TEST_DASM    Disassemble;

+  EBC_VM_TEST_EXECUTE    Execute;

+  EBC_VM_TEST_ASM        Assemble;

+  EBC_VM_TEST_DASM       Disassemble;

 };

 

-extern EFI_GUID gEfiEbcVmTestProtocolGuid;

+extern EFI_GUID  gEfiEbcVmTestProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/EsrtManagement.h b/MdeModulePkg/Include/Protocol/EsrtManagement.h
index e5afb83..f4dfefb 100644
--- a/MdeModulePkg/Include/Protocol/EsrtManagement.h
+++ b/MdeModulePkg/Include/Protocol/EsrtManagement.h
@@ -22,7 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///

 /// Forward declaration for the _ESRT_MANAGEMENT_PROTOCOL.

 ///

-typedef struct _ESRT_MANAGEMENT_PROTOCOL  ESRT_MANAGEMENT_PROTOCOL;

+typedef struct _ESRT_MANAGEMENT_PROTOCOL ESRT_MANAGEMENT_PROTOCOL;

 

 /**

   Get Variable name and data by Esrt Entry FwClass

@@ -41,7 +41,6 @@ EFI_STATUS
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY *Entry

   );

 

-

 /**

   Update one ESRT entry in ESRT Cache.

 

@@ -58,7 +57,6 @@ EFI_STATUS
   IN EFI_SYSTEM_RESOURCE_ENTRY *Entry

   );

 

-

 /**

   Non-FMP instance to unregister Esrt Entry from ESRT Cache.

 

@@ -74,7 +72,6 @@ EFI_STATUS
   IN  EFI_GUID        *FwClass

   );

 

-

 /**

   Non-FMP instance to register one ESRT entry into ESRT Cache.

 

@@ -91,7 +88,6 @@ EFI_STATUS
   IN EFI_SYSTEM_RESOURCE_ENTRY *Entry

   );

 

-

 /**

   This function syn up Cached ESRT with data from FMP instances

   Function should be called after Connect All in order to locate all FMP protocols

@@ -108,7 +104,6 @@ EFI_STATUS
   VOID

   );

 

-

 /**

   This function locks up Esrt repository to be readonly. It should be called

   before gEfiEndOfDxeEventGroupGuid event signaled

@@ -122,17 +117,15 @@ EFI_STATUS
   VOID

   );

 

-

 struct _ESRT_MANAGEMENT_PROTOCOL {

-  GET_ESRT_ENTRY        GetEsrtEntry;

-  UPDATE_ESRT_ENTRY     UpdateEsrtEntry;

-  REGISTER_ESRT_ENTRY   RegisterEsrtEntry;

-  UNREGISTER_ESRT_ENTRY UnRegisterEsrtEntry;

-  SYNC_ESRT_FMP         SyncEsrtFmp;

-  LOCK_ESRT_REPOSITORY  LockEsrtRepository;

+  GET_ESRT_ENTRY           GetEsrtEntry;

+  UPDATE_ESRT_ENTRY        UpdateEsrtEntry;

+  REGISTER_ESRT_ENTRY      RegisterEsrtEntry;

+  UNREGISTER_ESRT_ENTRY    UnRegisterEsrtEntry;

+  SYNC_ESRT_FMP            SyncEsrtFmp;

+  LOCK_ESRT_REPOSITORY     LockEsrtRepository;

 };

 

-extern EFI_GUID gEsrtManagementProtocolGuid;

+extern EFI_GUID  gEsrtManagementProtocolGuid;

 

 #endif // #ifndef _ESRT_MANAGEMENT_H_

-

diff --git a/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h b/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
index cf70261..8fbd8c6 100644
--- a/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
+++ b/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
@@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EFI_FAULT_TOLERANT_WRITE_PROTOCOL  EFI_FAULT_TOLERANT_WRITE_PROTOCOL;

+typedef struct _EFI_FAULT_TOLERANT_WRITE_PROTOCOL EFI_FAULT_TOLERANT_WRITE_PROTOCOL;

 

 /**

   Get the size of the largest block that can be updated in a fault-tolerant manner.

@@ -37,7 +37,7 @@ typedef struct _EFI_FAULT_TOLERANT_WRITE_PROTOCOL  EFI_FAULT_TOLERANT_WRITE_PROT
 typedef

 EFI_STATUS

 (EFIAPI *EFI_FAULT_TOLERANT_WRITE_GET_MAX_BLOCK_SIZE)(

-  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL    * This,

+  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL    *This,

   OUT UINTN                               *BlockSize

   );

 

@@ -65,8 +65,8 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_FAULT_TOLERANT_WRITE_ALLOCATE)(

-  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL    * This,

-  IN EFI_GUID                             * CallerId,

+  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL    *This,

+  IN EFI_GUID                             *CallerId,

   IN UINTN                                PrivateDataSize,

   IN UINTN                                NumberOfWrites

   );

@@ -101,7 +101,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_FAULT_TOLERANT_WRITE_WRITE)(

-  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     * This,

+  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     *This,

   IN EFI_LBA                               Lba,

   IN UINTN                                 Offset,

   IN UINTN                                 Length,

@@ -126,7 +126,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_FAULT_TOLERANT_WRITE_RESTART)(

-  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     * This,

+  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     *This,

   IN EFI_HANDLE                            FvbHandle

   );

 

@@ -143,7 +143,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_FAULT_TOLERANT_WRITE_ABORT)(

-  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     * This

+  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     *This

   );

 

 /**

@@ -174,8 +174,8 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_FAULT_TOLERANT_WRITE_GET_LAST_WRITE)(

-  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     * This,

-  OUT EFI_GUID                             * CallerId,

+  IN EFI_FAULT_TOLERANT_WRITE_PROTOCOL     *This,

+  OUT EFI_GUID                             *CallerId,

   OUT EFI_LBA                              *Lba,

   OUT UINTN                                *Offset,

   OUT UINTN                                *Length,

@@ -188,14 +188,14 @@ EFI_STATUS
 // Protocol declaration

 //

 struct _EFI_FAULT_TOLERANT_WRITE_PROTOCOL {

-  EFI_FAULT_TOLERANT_WRITE_GET_MAX_BLOCK_SIZE GetMaxBlockSize;

-  EFI_FAULT_TOLERANT_WRITE_ALLOCATE           Allocate;

-  EFI_FAULT_TOLERANT_WRITE_WRITE              Write;

-  EFI_FAULT_TOLERANT_WRITE_RESTART            Restart;

-  EFI_FAULT_TOLERANT_WRITE_ABORT              Abort;

-  EFI_FAULT_TOLERANT_WRITE_GET_LAST_WRITE     GetLastWrite;

+  EFI_FAULT_TOLERANT_WRITE_GET_MAX_BLOCK_SIZE    GetMaxBlockSize;

+  EFI_FAULT_TOLERANT_WRITE_ALLOCATE              Allocate;

+  EFI_FAULT_TOLERANT_WRITE_WRITE                 Write;

+  EFI_FAULT_TOLERANT_WRITE_RESTART               Restart;

+  EFI_FAULT_TOLERANT_WRITE_ABORT                 Abort;

+  EFI_FAULT_TOLERANT_WRITE_GET_LAST_WRITE        GetLastWrite;

 };

 

-extern EFI_GUID gEfiFaultTolerantWriteProtocolGuid;

+extern EFI_GUID  gEfiFaultTolerantWriteProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/FileExplorer.h b/MdeModulePkg/Include/Protocol/FileExplorer.h
index a6e949d..aa14d27 100644
--- a/MdeModulePkg/Include/Protocol/FileExplorer.h
+++ b/MdeModulePkg/Include/Protocol/FileExplorer.h
@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EFI_FILE_EXPLORER_PROTOCOL  EFI_FILE_EXPLORER_PROTOCOL;

+typedef struct _EFI_FILE_EXPLORER_PROTOCOL EFI_FILE_EXPLORER_PROTOCOL;

 

 /**

   Prototype for the next process after user chosed one file.

@@ -53,7 +53,7 @@ BOOLEAN
 **/

 typedef

 EFI_STATUS

-(EFIAPI   *CHOOSE_FILE) (

+(EFIAPI   *CHOOSE_FILE)(

   IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,

   IN  CHAR16                    *FileType   OPTIONAL,

   IN  CHOOSE_HANDLER            ChooseHandler   OPTIONAL,

@@ -61,9 +61,9 @@ EFI_STATUS
   );

 

 struct _EFI_FILE_EXPLORER_PROTOCOL {

-  CHOOSE_FILE                          ChooseFile;

+  CHOOSE_FILE    ChooseFile;

 };

 

-extern EFI_GUID gEfiFileExplorerProtocolGuid;

+extern EFI_GUID  gEfiFileExplorerProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/FirmwareManagementProgress.h b/MdeModulePkg/Include/Protocol/FirmwareManagementProgress.h
index 8e89bfe..1f518e7 100644
--- a/MdeModulePkg/Include/Protocol/FirmwareManagementProgress.h
+++ b/MdeModulePkg/Include/Protocol/FirmwareManagementProgress.h
@@ -26,24 +26,24 @@ typedef struct {
   ///

   /// The version of this structure.  Initial version value is 0x00000001.

   ///

-  UINT32                               Version;

+  UINT32                                 Version;

   ///

   /// The foreground color of a progress bar that is used by the Progress()

   /// function that is passed into the Firmware Management Protocol SetImage()

   /// service is called.

   ///

-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION  ProgressBarForegroundColor;

+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION    ProgressBarForegroundColor;

   ///

   /// The time in seconds to arm the watchdog timer each time the Progress()

   /// function passed into the  Firmware Management Protocol SetImage() service

   /// is called.

   ///

-  UINTN                                WatchdogSeconds;

+  UINTN                                  WatchdogSeconds;

 } EDKII_FIRMWARE_MANAGEMENT_PROGRESS_PROTOCOL;

 

 ///

 /// EDK II Firmware Management Progress Protocol GUID variable.

 ///

-extern EFI_GUID gEdkiiFirmwareManagementProgressProtocolGuid;

+extern EFI_GUID  gEdkiiFirmwareManagementProgressProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index e7e7cd1..d03665b 100644
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx.h
+++ b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
@@ -13,32 +13,32 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define FORM_BROWSER_EXTENSION_PROTOCOL_GUID  \

   { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } }

 

-typedef struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL   EDKII_FORM_BROWSER_EXTENSION_PROTOCOL;

+typedef struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL EDKII_FORM_BROWSER_EXTENSION_PROTOCOL;

 

 //

 // To be compatible, keep EFI_FORM_BROWSER_EXTENSION_PROTOCOL definition

 //

-typedef EDKII_FORM_BROWSER_EXTENSION_PROTOCOL   EFI_FORM_BROWSER_EXTENSION_PROTOCOL;

+typedef EDKII_FORM_BROWSER_EXTENSION_PROTOCOL EFI_FORM_BROWSER_EXTENSION_PROTOCOL;

 

 //

 // Return value of SAVE_REMINDER() that describes whether the changed data is saved or discarded.

 //

-#define BROWSER_NO_CHANGES          0

-#define BROWSER_SAVE_CHANGES        1

-#define BROWSER_DISCARD_CHANGES     2

-#define BROWSER_KEEP_CURRENT        3

+#define BROWSER_NO_CHANGES       0

+#define BROWSER_SAVE_CHANGES     1

+#define BROWSER_DISCARD_CHANGES  2

+#define BROWSER_KEEP_CURRENT     3

 

 //

 // Browser actions. They can be cominbed together.

 // If more than one actions are specified, the action with low bit will be executed first.

 //

-#define BROWSER_ACTION_UNREGISTER   0

-#define BROWSER_ACTION_DISCARD      BIT0

-#define BROWSER_ACTION_DEFAULT      BIT1

-#define BROWSER_ACTION_SUBMIT       BIT2

-#define BROWSER_ACTION_RESET        BIT3

-#define BROWSER_ACTION_EXIT         BIT4

-#define BROWSER_ACTION_GOTO         BIT5

+#define BROWSER_ACTION_UNREGISTER  0

+#define BROWSER_ACTION_DISCARD     BIT0

+#define BROWSER_ACTION_DEFAULT     BIT1

+#define BROWSER_ACTION_SUBMIT      BIT2

+#define BROWSER_ACTION_RESET       BIT3

+#define BROWSER_ACTION_EXIT        BIT4

+#define BROWSER_ACTION_GOTO        BIT5

 

 //

 // Scope for Browser action. It may be Form, FormSet or System level.

@@ -65,7 +65,7 @@ typedef enum {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *SET_SCOPE) (

+(EFIAPI *SET_SCOPE)(

   IN BROWSER_SETTING_SCOPE Scope

   );

 

@@ -87,7 +87,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *REGISTER_HOT_KEY) (

+(EFIAPI *REGISTER_HOT_KEY)(

   IN EFI_INPUT_KEY *KeyData,

   IN UINT32        Action,

   IN UINT16        DefaultId,

@@ -102,7 +102,7 @@ EFI_STATUS
 **/

 typedef

 VOID

-(EFIAPI *EXIT_HANDLER) (

+(EFIAPI *EXIT_HANDLER)(

   VOID

   );

 

@@ -116,7 +116,7 @@ VOID
 **/

 typedef

 VOID

-(EFIAPI *REGISTER_EXIT_HANDLER) (

+(EFIAPI *REGISTER_EXIT_HANDLER)(

   IN EXIT_HANDLER Handler

   );

 

@@ -137,13 +137,12 @@ UINT32
   );

 

 struct _EDKII_FORM_BROWSER_EXTENSION_PROTOCOL {

-  SET_SCOPE              SetScope;

-  REGISTER_HOT_KEY       RegisterHotKey;

-  REGISTER_EXIT_HANDLER  RegiserExitHandler;

-  SAVE_REMINDER          SaveReminder;

+  SET_SCOPE                SetScope;

+  REGISTER_HOT_KEY         RegisterHotKey;

+  REGISTER_EXIT_HANDLER    RegiserExitHandler;

+  SAVE_REMINDER            SaveReminder;

 };

 

-extern EFI_GUID gEdkiiFormBrowserExProtocolGuid;

+extern EFI_GUID  gEdkiiFormBrowserExProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx2.h b/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
index 438c8ee..725f927 100644
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
+++ b/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
@@ -15,7 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL_GUID  \

   { 0xa770c357, 0xb693, 0x4e6d, { 0xa6, 0xcf, 0xd2, 0x1c, 0x72, 0x8e, 0x55, 0xb }}

 

-typedef struct _EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL   EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL;

+typedef struct _EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL;

 

 #define BROWSER_EXTENSION2_VERSION_1    0x10000

 #define BROWSER_EXTENSION2_VERSION_1_1  0x10001

@@ -29,7 +29,7 @@ typedef struct _EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL   EDKII_FORM_BROWSER_EXTE
 **/

 typedef

 BOOLEAN

-(EFIAPI *IS_BROWSER_DATA_MODIFIED) (

+(EFIAPI *IS_BROWSER_DATA_MODIFIED)(

   VOID

   );

 

@@ -44,7 +44,7 @@ BOOLEAN
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EXECUTE_ACTION) (

+(EFIAPI *EXECUTE_ACTION)(

   IN UINT32        Action,

   IN UINT16        DefaultId

   );

@@ -58,35 +58,35 @@ EFI_STATUS
 **/

 typedef

 BOOLEAN

-(EFIAPI *IS_RESET_REQUIRED) (

+(EFIAPI *IS_RESET_REQUIRED)(

   VOID

   );

 

-#define FORM_ENTRY_INFO_SIGNATURE    SIGNATURE_32 ('f', 'e', 'i', 's')

+#define FORM_ENTRY_INFO_SIGNATURE  SIGNATURE_32 ('f', 'e', 'i', 's')

 

 typedef struct {

-  UINTN           Signature;

-  LIST_ENTRY      Link;

+  UINTN              Signature;

+  LIST_ENTRY         Link;

 

-  EFI_HII_HANDLE  HiiHandle;

-  EFI_GUID        FormSetGuid;

-  EFI_FORM_ID     FormId;

-  EFI_QUESTION_ID QuestionId;

+  EFI_HII_HANDLE     HiiHandle;

+  EFI_GUID           FormSetGuid;

+  EFI_FORM_ID        FormId;

+  EFI_QUESTION_ID    QuestionId;

 } FORM_ENTRY_INFO;

 

 #define FORM_ENTRY_INFO_FROM_LINK(a)  CR (a, FORM_ENTRY_INFO, Link, FORM_ENTRY_INFO_SIGNATURE)

 

-#define FORM_QUESTION_ATTRIBUTE_OVERRIDE_SIGNATURE    SIGNATURE_32 ('f', 'q', 'o', 's')

+#define FORM_QUESTION_ATTRIBUTE_OVERRIDE_SIGNATURE  SIGNATURE_32 ('f', 'q', 'o', 's')

 

 typedef struct {

-  UINTN            Signature;

-  LIST_ENTRY       Link;

-

-  EFI_QUESTION_ID  QuestionId;           // Find the question

-  EFI_FORM_ID      FormId;               // Find the form

-  EFI_GUID         FormSetGuid;          // Find the formset.

-  EFI_HII_HANDLE   HiiHandle;            // Find the HII handle

-  UINT32           Attribute;            // Hide or grayout ...

+  UINTN              Signature;

+  LIST_ENTRY         Link;

+

+  EFI_QUESTION_ID    QuestionId;         // Find the question

+  EFI_FORM_ID        FormId;             // Find the form

+  EFI_GUID           FormSetGuid;        // Find the formset.

+  EFI_HII_HANDLE     HiiHandle;          // Find the HII handle

+  UINT32             Attribute;          // Hide or grayout ...

 } QUESTION_ATTRIBUTE_OVERRIDE;

 

 #define FORM_QUESTION_ATTRIBUTE_OVERRIDE_FROM_LINK(a)  CR (a, QUESTION_ATTRIBUTE_OVERRIDE, Link, FORM_QUESTION_ATTRIBUTE_OVERRIDE_SIGNATURE)

@@ -95,25 +95,24 @@ struct _EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL {
   ///

   /// Version for protocol future extension.

   ///

-  UINT32                    Version;

-  SET_SCOPE                 SetScope;

-  REGISTER_HOT_KEY          RegisterHotKey;

-  REGISTER_EXIT_HANDLER     RegiserExitHandler;

-  IS_BROWSER_DATA_MODIFIED  IsBrowserDataModified;

-  EXECUTE_ACTION            ExecuteAction;

+  UINT32                      Version;

+  SET_SCOPE                   SetScope;

+  REGISTER_HOT_KEY            RegisterHotKey;

+  REGISTER_EXIT_HANDLER       RegiserExitHandler;

+  IS_BROWSER_DATA_MODIFIED    IsBrowserDataModified;

+  EXECUTE_ACTION              ExecuteAction;

   ///

   /// A list of type FORMID_INFO is Browser View Form History List.

   ///

-  LIST_ENTRY                FormViewHistoryHead;

+  LIST_ENTRY                  FormViewHistoryHead;

   ///

   /// A list of type QUESTION_ATTRIBUTE_OVERRIDE.

   ///

-  LIST_ENTRY                OverrideQestListHead;

+  LIST_ENTRY                  OverrideQestListHead;

 

-  IS_RESET_REQUIRED         IsResetRequired;

+  IS_RESET_REQUIRED           IsResetRequired;

 };

 

-extern EFI_GUID gEdkiiFormBrowserEx2ProtocolGuid;

+extern EFI_GUID  gEdkiiFormBrowserEx2ProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
index 08157f3..00cf601 100644
--- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
+++ b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
@@ -12,7 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define EFI_GENERIC_MEMORY_TEST_PROTOCOL_GUID  \

   { 0x309de7f1, 0x7f5e, 0x4ace, {0xb4, 0x9c, 0x53, 0x1b, 0xe5, 0xaa, 0x95, 0xef} }

 

-typedef struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL  EFI_GENERIC_MEMORY_TEST_PROTOCOL;

+typedef struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL EFI_GENERIC_MEMORY_TEST_PROTOCOL;

 

 ///

 /// Memory test coverage level.

@@ -26,7 +26,6 @@ typedef enum {
   MAXLEVEL

 } EXTENDMEM_COVERAGE_LEVEL;

 

-

 /**

   Initialize the generic memory test.

 

@@ -46,7 +45,6 @@ EFI_STATUS
   OUT BOOLEAN                                  *RequireSoftECCInit

   );

 

-

 /**

   Perform the memory test.

 

@@ -72,7 +70,6 @@ EFI_STATUS
   IN BOOLEAN                                   IfTestAbort

   );

 

-

 /**

   Finish the memory test.

 

@@ -108,13 +105,12 @@ EFI_STATUS
   );

 

 struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL {

-  EFI_MEMORY_TEST_INIT              MemoryTestInit;

-  EFI_PERFORM_MEMORY_TEST           PerformMemoryTest;

-  EFI_MEMORY_TEST_FINISHED          Finished;

-  EFI_MEMORY_TEST_COMPATIBLE_RANGE  CompatibleRangeTest;

+  EFI_MEMORY_TEST_INIT                MemoryTestInit;

+  EFI_PERFORM_MEMORY_TEST             PerformMemoryTest;

+  EFI_MEMORY_TEST_FINISHED            Finished;

+  EFI_MEMORY_TEST_COMPATIBLE_RANGE    CompatibleRangeTest;

 };

 

-extern EFI_GUID gEfiGenericMemTestProtocolGuid;

+extern EFI_GUID  gEfiGenericMemTestProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/IoMmu.h b/MdeModulePkg/Include/Protocol/IoMmu.h
index 3fd35b8..f14ed96 100644
--- a/MdeModulePkg/Include/Protocol/IoMmu.h
+++ b/MdeModulePkg/Include/Protocol/IoMmu.h
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #ifndef __IOMMU_H__

 #define __IOMMU_H__

 

@@ -21,14 +20,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EDKII_IOMMU_PROTOCOL  EDKII_IOMMU_PROTOCOL;

+typedef struct _EDKII_IOMMU_PROTOCOL EDKII_IOMMU_PROTOCOL;

 

 //

 // Revision The revision to which the IOMMU interface adheres.

 //          All future revisions must be backwards compatible.

 //          If a future version is not back wards compatible it is not the same GUID.

 //

-#define EDKII_IOMMU_PROTOCOL_REVISION 0x00010000

+#define EDKII_IOMMU_PROTOCOL_REVISION  0x00010000

 

 //

 // IOMMU Access for SetAttribute

@@ -80,13 +79,13 @@ typedef enum {
 // IOMMU attribute for AllocateBuffer

 // Any undefined bits are reserved and must be zero.

 //

-#define EDKII_IOMMU_ATTRIBUTE_MEMORY_WRITE_COMBINE        0x0080

-#define EDKII_IOMMU_ATTRIBUTE_MEMORY_CACHED               0x0800

-#define EDKII_IOMMU_ATTRIBUTE_DUAL_ADDRESS_CYCLE          0x8000

+#define EDKII_IOMMU_ATTRIBUTE_MEMORY_WRITE_COMBINE  0x0080

+#define EDKII_IOMMU_ATTRIBUTE_MEMORY_CACHED         0x0800

+#define EDKII_IOMMU_ATTRIBUTE_DUAL_ADDRESS_CYCLE    0x8000

 

-#define EDKII_IOMMU_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER   (EDKII_IOMMU_ATTRIBUTE_MEMORY_WRITE_COMBINE | EDKII_IOMMU_ATTRIBUTE_MEMORY_CACHED | EDKII_IOMMU_ATTRIBUTE_DUAL_ADDRESS_CYCLE)

+#define EDKII_IOMMU_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER  (EDKII_IOMMU_ATTRIBUTE_MEMORY_WRITE_COMBINE | EDKII_IOMMU_ATTRIBUTE_MEMORY_CACHED | EDKII_IOMMU_ATTRIBUTE_DUAL_ADDRESS_CYCLE)

 

-#define EDKII_IOMMU_ATTRIBUTE_INVALID_FOR_ALLOCATE_BUFFER (~EDKII_IOMMU_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER)

+#define EDKII_IOMMU_ATTRIBUTE_INVALID_FOR_ALLOCATE_BUFFER  (~EDKII_IOMMU_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER)

 

 /**

   Set IOMMU attribute for a system memory.

@@ -237,17 +236,17 @@ EFI_STATUS
 /// IOMMU Protocol structure.

 ///

 struct _EDKII_IOMMU_PROTOCOL {

-  UINT64                              Revision;

-  EDKII_IOMMU_SET_ATTRIBUTE           SetAttribute;

-  EDKII_IOMMU_MAP                     Map;

-  EDKII_IOMMU_UNMAP                   Unmap;

-  EDKII_IOMMU_ALLOCATE_BUFFER         AllocateBuffer;

-  EDKII_IOMMU_FREE_BUFFER             FreeBuffer;

+  UINT64                         Revision;

+  EDKII_IOMMU_SET_ATTRIBUTE      SetAttribute;

+  EDKII_IOMMU_MAP                Map;

+  EDKII_IOMMU_UNMAP              Unmap;

+  EDKII_IOMMU_ALLOCATE_BUFFER    AllocateBuffer;

+  EDKII_IOMMU_FREE_BUFFER        FreeBuffer;

 };

 

 ///

 /// IOMMU Protocol GUID variable.

 ///

-extern EFI_GUID gEdkiiIoMmuProtocolGuid;

+extern EFI_GUID  gEdkiiIoMmuProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/IpmiProtocol.h b/MdeModulePkg/Include/Protocol/IpmiProtocol.h
index 41db3bc..61083b0 100644
--- a/MdeModulePkg/Include/Protocol/IpmiProtocol.h
+++ b/MdeModulePkg/Include/Protocol/IpmiProtocol.h
@@ -21,7 +21,6 @@ typedef struct _IPMI_PROTOCOL IPMI_PROTOCOL;
     0x5169af60, 0x8c5a, 0x4243, 0xb3, 0xe9, 0x56, 0xc5, 0x6d, 0x18, 0xee, 0x26 \

   }

 

-

 /**

   This service enables submitting commands via Ipmi.

 

@@ -43,24 +42,24 @@ typedef struct _IPMI_PROTOCOL IPMI_PROTOCOL;
 **/

 typedef

 EFI_STATUS

-(EFIAPI *IPMI_SUBMIT_COMMAND) (

+(EFIAPI *IPMI_SUBMIT_COMMAND)(

   IN     IPMI_PROTOCOL                 *This,

   IN     UINT8                         NetFunction,

   IN     UINT8                         Command,

   IN     UINT8                         *RequestData,

   IN     UINT32                        RequestDataSize,

-     OUT UINT8                         *ResponseData,

+  OUT UINT8                         *ResponseData,

   IN OUT UINT32                        *ResponseDataSize

   );

 

 //

 // IPMI COMMAND PROTOCOL

 //

-struct _IPMI_PROTOCOL{

-  IPMI_SUBMIT_COMMAND       IpmiSubmitCommand;

+struct _IPMI_PROTOCOL {

+  IPMI_SUBMIT_COMMAND    IpmiSubmitCommand;

 };

 

-extern EFI_GUID gIpmiProtocolGuid;

-extern EFI_GUID gSmmIpmiProtocolGuid;

+extern EFI_GUID  gIpmiProtocolGuid;

+extern EFI_GUID  gSmmIpmiProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/LoadPe32Image.h b/MdeModulePkg/Include/Protocol/LoadPe32Image.h
index f71e92c..5149428 100644
--- a/MdeModulePkg/Include/Protocol/LoadPe32Image.h
+++ b/MdeModulePkg/Include/Protocol/LoadPe32Image.h
@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION                 0x01

 #define EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION  0x02

 

-typedef struct _EFI_PE32_IMAGE_PROTOCOL   EFI_PE32_IMAGE_PROTOCOL;

+typedef struct _EFI_PE32_IMAGE_PROTOCOL EFI_PE32_IMAGE_PROTOCOL;

 

 /**

 

@@ -87,11 +87,10 @@ EFI_STATUS
   );

 

 struct _EFI_PE32_IMAGE_PROTOCOL {

-  LOAD_PE_IMAGE     LoadPeImage;

-  UNLOAD_PE_IMAGE   UnLoadPeImage;

+  LOAD_PE_IMAGE      LoadPeImage;

+  UNLOAD_PE_IMAGE    UnLoadPeImage;

 };

 

-extern EFI_GUID gEfiLoadPeImageProtocolGuid;

+extern EFI_GUID  gEfiLoadPeImageProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/LockBox.h b/MdeModulePkg/Include/Protocol/LockBox.h
index 9453650..4c6e28c 100644
--- a/MdeModulePkg/Include/Protocol/LockBox.h
+++ b/MdeModulePkg/Include/Protocol/LockBox.h
@@ -19,6 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define EFI_LOCK_BOX_PROTOCOL_GUID \

   { 0xbd445d79, 0xb7ad, 0x4f04, { 0x9a, 0xd8, 0x29, 0xbd, 0x20, 0x40, 0xeb, 0x3c }}

 

-extern EFI_GUID gEfiLockBoxProtocolGuid;

+extern EFI_GUID  gEfiLockBoxProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h b/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h
index 53ab804..2399e6f 100644
--- a/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h
+++ b/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h
@@ -43,7 +43,7 @@ typedef enum {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *NON_DISCOVERABLE_DEVICE_INIT) (

+(EFIAPI *NON_DISCOVERABLE_DEVICE_INIT)(

   IN  NON_DISCOVERABLE_DEVICE       *This

   );

 

@@ -51,21 +51,21 @@ struct _NON_DISCOVERABLE_DEVICE {
   //

   // The type of device

   //

-  CONST EFI_GUID                      *Type;

+  CONST EFI_GUID                       *Type;

   //

   // Whether this device is DMA coherent

   //

-  NON_DISCOVERABLE_DEVICE_DMA_TYPE    DmaType;

+  NON_DISCOVERABLE_DEVICE_DMA_TYPE     DmaType;

   //

   // Initialization function for the device

   //

-  NON_DISCOVERABLE_DEVICE_INIT        Initialize;

+  NON_DISCOVERABLE_DEVICE_INIT         Initialize;

   //

   // The MMIO and I/O regions owned by the device

   //

-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR   *Resources;

+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR    *Resources;

 };

 

-extern EFI_GUID gEdkiiNonDiscoverableDeviceProtocolGuid;

+extern EFI_GUID  gEdkiiNonDiscoverableDeviceProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h b/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h
index c7f287d..ca6c94b 100644
--- a/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h
+++ b/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h
@@ -27,7 +27,7 @@ typedef struct _EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL EDKII_PECOFF_IMAGE_EMULATOR
 **/

 typedef

 BOOLEAN

-(EFIAPI *EDKII_PECOFF_IMAGE_EMULATOR_IS_IMAGE_SUPPORTED) (

+(EFIAPI *EDKII_PECOFF_IMAGE_EMULATOR_IS_IMAGE_SUPPORTED)(

   IN  EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL    *This,

   IN  UINT16                                  ImageType,

   IN  EFI_DEVICE_PATH_PROTOCOL                *DevicePath   OPTIONAL

@@ -57,7 +57,7 @@ BOOLEAN
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EDKII_PECOFF_IMAGE_EMULATOR_REGISTER_IMAGE) (

+(EFIAPI *EDKII_PECOFF_IMAGE_EMULATOR_REGISTER_IMAGE)(

   IN      EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL    *This,

   IN      EFI_PHYSICAL_ADDRESS                    ImageBase,

   IN      UINT64                                  ImageSize,

@@ -77,12 +77,12 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EDKII_PECOFF_IMAGE_EMULATOR_UNREGISTER_IMAGE) (

+(EFIAPI *EDKII_PECOFF_IMAGE_EMULATOR_UNREGISTER_IMAGE)(

   IN  EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL    *This,

   IN  EFI_PHYSICAL_ADDRESS                    ImageBase

   );

 

-#define EDKII_PECOFF_IMAGE_EMULATOR_VERSION         0x1

+#define EDKII_PECOFF_IMAGE_EMULATOR_VERSION  0x1

 

 typedef struct _EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL {

   EDKII_PECOFF_IMAGE_EMULATOR_IS_IMAGE_SUPPORTED    IsImageSupported;

@@ -95,6 +95,6 @@ typedef struct _EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL {
   UINT16                                            MachineType;

 } EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL;

 

-extern EFI_GUID gEdkiiPeCoffImageEmulatorProtocolGuid;

+extern EFI_GUID  gEdkiiPeCoffImageEmulatorProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/PlatformBootManager.h b/MdeModulePkg/Include/Protocol/PlatformBootManager.h
index 26b9ce4..e527b0e 100644
--- a/MdeModulePkg/Include/Protocol/PlatformBootManager.h
+++ b/MdeModulePkg/Include/Protocol/PlatformBootManager.h
@@ -29,7 +29,7 @@ typedef struct _EDKII_PLATFORM_BOOT_MANAGER_PROTOCOL EDKII_PLATFORM_BOOT_MANAGER
 //          All future revisions must be backwards compatible.

 //          If a future version is not back wards compatible it is not the same GUID.

 //

-#define EDKII_PLATFORM_BOOT_MANAGER_PROTOCOL_REVISION 0x00000001

+#define EDKII_PLATFORM_BOOT_MANAGER_PROTOCOL_REVISION  0x00000001

 

 //

 // Function Prototypes

@@ -65,7 +65,7 @@ typedef struct _EDKII_PLATFORM_BOOT_MANAGER_PROTOCOL EDKII_PLATFORM_BOOT_MANAGER
 */

 typedef

 EFI_STATUS

-(EFIAPI *PLATFORM_BOOT_MANAGER_REFRESH_ALL_BOOT_OPTIONS) (

+(EFIAPI *PLATFORM_BOOT_MANAGER_REFRESH_ALL_BOOT_OPTIONS)(

   IN  CONST EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions,

   IN  CONST UINTN                        BootOptionsCount,

   OUT       EFI_BOOT_MANAGER_LOAD_OPTION **UpdatedBootOptions,

@@ -73,10 +73,10 @@ EFI_STATUS
   );

 

 struct _EDKII_PLATFORM_BOOT_MANAGER_PROTOCOL {

-  UINT64                                         Revision;

-  PLATFORM_BOOT_MANAGER_REFRESH_ALL_BOOT_OPTIONS RefreshAllBootOptions;

+  UINT64                                            Revision;

+  PLATFORM_BOOT_MANAGER_REFRESH_ALL_BOOT_OPTIONS    RefreshAllBootOptions;

 };

 

-extern EFI_GUID gEdkiiPlatformBootManagerProtocolGuid;

+extern EFI_GUID  gEdkiiPlatformBootManagerProtocolGuid;

 

 #endif /* __PLATFORM_BOOT_MANAGER_PROTOCOL_H__ */

diff --git a/MdeModulePkg/Include/Protocol/PlatformLogo.h b/MdeModulePkg/Include/Protocol/PlatformLogo.h
index 55c9e08..08e1dc3 100644
--- a/MdeModulePkg/Include/Protocol/PlatformLogo.h
+++ b/MdeModulePkg/Include/Protocol/PlatformLogo.h
@@ -50,18 +50,16 @@ EFI_STATUS
 (EFIAPI *EDKII_PLATFORM_LOGO_GET_IMAGE)(

   IN     EDKII_PLATFORM_LOGO_PROTOCOL          *This,

   IN OUT UINT32                                *Instance,

-     OUT EFI_IMAGE_INPUT                       *Image,

-     OUT EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE *Attribute,

-     OUT INTN                                  *OffsetX,

-     OUT INTN                                  *OffsetY

+  OUT EFI_IMAGE_INPUT                       *Image,

+  OUT EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE *Attribute,

+  OUT INTN                                  *OffsetX,

+  OUT INTN                                  *OffsetY

   );

 

-

 struct _EDKII_PLATFORM_LOGO_PROTOCOL {

-  EDKII_PLATFORM_LOGO_GET_IMAGE GetImage;

+  EDKII_PLATFORM_LOGO_GET_IMAGE    GetImage;

 };

 

-

-extern EFI_GUID gEdkiiPlatformLogoProtocolGuid;

+extern EFI_GUID  gEdkiiPlatformLogoProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/PlatformSpecificResetFilter.h b/MdeModulePkg/Include/Protocol/PlatformSpecificResetFilter.h
index 4a55a3a..482be1e 100644
--- a/MdeModulePkg/Include/Protocol/PlatformSpecificResetFilter.h
+++ b/MdeModulePkg/Include/Protocol/PlatformSpecificResetFilter.h
@@ -18,8 +18,8 @@
 #define EDKII_PLATFORM_SPECIFIC_RESET_FILTER_PROTOCOL_GUID \

   { 0x695d7835, 0x8d47, 0x4c11, { 0xab, 0x22, 0xfa, 0x8a, 0xcc, 0xe7, 0xae, 0x7a } }

 

-typedef EFI_RESET_NOTIFICATION_PROTOCOL  EDKII_PLATFORM_SPECIFIC_RESET_FILTER_PROTOCOL;

+typedef EFI_RESET_NOTIFICATION_PROTOCOL EDKII_PLATFORM_SPECIFIC_RESET_FILTER_PROTOCOL;

 

-extern EFI_GUID gEdkiiPlatformSpecificResetFilterProtocolGuid;

+extern EFI_GUID  gEdkiiPlatformSpecificResetFilterProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/PlatformSpecificResetHandler.h b/MdeModulePkg/Include/Protocol/PlatformSpecificResetHandler.h
index a2e936b..11dede4 100644
--- a/MdeModulePkg/Include/Protocol/PlatformSpecificResetHandler.h
+++ b/MdeModulePkg/Include/Protocol/PlatformSpecificResetHandler.h
@@ -16,8 +16,8 @@
 #define EDKII_PLATFORM_SPECIFIC_RESET_HANDLER_PROTOCOL_GUID \

   { 0x2df6ba0b, 0x7092, 0x440d, { 0xbd, 0x4, 0xfb, 0x9, 0x1e, 0xc3, 0xf3, 0xc1 } }

 

-typedef EFI_RESET_NOTIFICATION_PROTOCOL  EDKII_PLATFORM_SPECIFIC_RESET_HANDLER_PROTOCOL;

+typedef EFI_RESET_NOTIFICATION_PROTOCOL EDKII_PLATFORM_SPECIFIC_RESET_HANDLER_PROTOCOL;

 

-extern EFI_GUID gEdkiiPlatformSpecificResetHandlerProtocolGuid;

+extern EFI_GUID  gEdkiiPlatformSpecificResetHandlerProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/Print2.h b/MdeModulePkg/Include/Protocol/Print2.h
index 9f15d59..1e10a04 100644
--- a/MdeModulePkg/Include/Protocol/Print2.h
+++ b/MdeModulePkg/Include/Protocol/Print2.h
@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EFI_PRINT2_PROTOCOL  EFI_PRINT2_PROTOCOL;

+typedef struct _EFI_PRINT2_PROTOCOL EFI_PRINT2_PROTOCOL;

 

 /**

   Produces a Null-terminated Unicode string in an output buffer based on

@@ -496,20 +496,19 @@ UINTN
   );

 

 struct _EFI_PRINT2_PROTOCOL {

-  UNICODE_BS_PRINT                     UnicodeBSPrint;

-  UNICODE_S_PRINT                      UnicodeSPrint;

-  UNICODE_BS_PRINT_ASCII_FORMAT        UnicodeBSPrintAsciiFormat;

-  UNICODE_S_PRINT_ASCII_FORMAT         UnicodeSPrintAsciiFormat;

-  UNICODE_VALUE_TO_STRING              UnicodeValueToString;

-  ASCII_BS_PRINT                       AsciiBSPrint;

-  ASCII_S_PRINT                        AsciiSPrint;

-  ASCII_BS_PRINT_UNICODE_FORMAT        AsciiBSPrintUnicodeFormat;

-  ASCII_S_PRINT_UNICODE_FORMAT         AsciiSPrintUnicodeFormat;

-  ASCII_VALUE_TO_STRING                AsciiValueToString;

+  UNICODE_BS_PRINT                 UnicodeBSPrint;

+  UNICODE_S_PRINT                  UnicodeSPrint;

+  UNICODE_BS_PRINT_ASCII_FORMAT    UnicodeBSPrintAsciiFormat;

+  UNICODE_S_PRINT_ASCII_FORMAT     UnicodeSPrintAsciiFormat;

+  UNICODE_VALUE_TO_STRING          UnicodeValueToString;

+  ASCII_BS_PRINT                   AsciiBSPrint;

+  ASCII_S_PRINT                    AsciiSPrint;

+  ASCII_BS_PRINT_UNICODE_FORMAT    AsciiBSPrintUnicodeFormat;

+  ASCII_S_PRINT_UNICODE_FORMAT     AsciiSPrintUnicodeFormat;

+  ASCII_VALUE_TO_STRING            AsciiValueToString;

 };

 

-extern EFI_GUID gEfiPrint2ProtocolGuid;

-

+extern EFI_GUID  gEfiPrint2ProtocolGuid;

 

 #define EFI_PRINT2S_PROTOCOL_GUID  \

   { 0xcc252d2, 0xc106, 0x4661, { 0xb5, 0xbd, 0x31, 0x47, 0xa4, 0xf8, 0x1f, 0x92 } }

@@ -517,7 +516,7 @@ extern EFI_GUID gEfiPrint2ProtocolGuid;
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EFI_PRINT2S_PROTOCOL  EFI_PRINT2S_PROTOCOL;

+typedef struct _EFI_PRINT2S_PROTOCOL EFI_PRINT2S_PROTOCOL;

 

 /**

   Converts a decimal value to a Null-terminated Unicode string.

@@ -640,18 +639,18 @@ RETURN_STATUS
   );

 

 struct _EFI_PRINT2S_PROTOCOL {

-  UNICODE_BS_PRINT                     UnicodeBSPrint;

-  UNICODE_S_PRINT                      UnicodeSPrint;

-  UNICODE_BS_PRINT_ASCII_FORMAT        UnicodeBSPrintAsciiFormat;

-  UNICODE_S_PRINT_ASCII_FORMAT         UnicodeSPrintAsciiFormat;

-  UNICODE_VALUE_TO_STRING_S            UnicodeValueToStringS;

-  ASCII_BS_PRINT                       AsciiBSPrint;

-  ASCII_S_PRINT                        AsciiSPrint;

-  ASCII_BS_PRINT_UNICODE_FORMAT        AsciiBSPrintUnicodeFormat;

-  ASCII_S_PRINT_UNICODE_FORMAT         AsciiSPrintUnicodeFormat;

-  ASCII_VALUE_TO_STRING_S              AsciiValueToStringS;

+  UNICODE_BS_PRINT                 UnicodeBSPrint;

+  UNICODE_S_PRINT                  UnicodeSPrint;

+  UNICODE_BS_PRINT_ASCII_FORMAT    UnicodeBSPrintAsciiFormat;

+  UNICODE_S_PRINT_ASCII_FORMAT     UnicodeSPrintAsciiFormat;

+  UNICODE_VALUE_TO_STRING_S        UnicodeValueToStringS;

+  ASCII_BS_PRINT                   AsciiBSPrint;

+  ASCII_S_PRINT                    AsciiSPrint;

+  ASCII_BS_PRINT_UNICODE_FORMAT    AsciiBSPrintUnicodeFormat;

+  ASCII_S_PRINT_UNICODE_FORMAT     AsciiSPrintUnicodeFormat;

+  ASCII_VALUE_TO_STRING_S          AsciiValueToStringS;

 };

 

-extern EFI_GUID gEfiPrint2SProtocolGuid;

+extern EFI_GUID  gEfiPrint2SProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/Ps2Policy.h b/MdeModulePkg/Include/Protocol/Ps2Policy.h
index 35ff6e0..2f73b3d 100644
--- a/MdeModulePkg/Include/Protocol/Ps2Policy.h
+++ b/MdeModulePkg/Include/Protocol/Ps2Policy.h
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #ifndef _PS2_POLICY_PROTOCOL_H_

 #define _PS2_POLICY_PROTOCOL_H_

 

@@ -15,21 +14,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x4df19259, 0xdc71, 0x4d46, {0xbe, 0xf1, 0x35, 0x7b, 0xb5, 0x78, 0xc4, 0x18 } \

   }

 

-#define EFI_KEYBOARD_CAPSLOCK   0x0004

-#define EFI_KEYBOARD_NUMLOCK    0x0002

-#define EFI_KEYBOARD_SCROLLLOCK 0x0001

+#define EFI_KEYBOARD_CAPSLOCK    0x0004

+#define EFI_KEYBOARD_NUMLOCK     0x0002

+#define EFI_KEYBOARD_SCROLLLOCK  0x0001

 

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PS2_INIT_HARDWARE) (

+(EFIAPI *EFI_PS2_INIT_HARDWARE)(

   IN  EFI_HANDLE              Handle

   );

 

 typedef struct {

-  UINT8                 KeyboardLight;

-  EFI_PS2_INIT_HARDWARE Ps2InitHardware;

+  UINT8                    KeyboardLight;

+  EFI_PS2_INIT_HARDWARE    Ps2InitHardware;

 } EFI_PS2_POLICY_PROTOCOL;

 

-extern EFI_GUID gEfiPs2PolicyProtocolGuid;

+extern EFI_GUID  gEfiPs2PolicyProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
index d440272..4fd12b9 100644
--- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
+++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
@@ -16,16 +16,16 @@
 #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \

   { 0xeaf9e3c1, 0xc9cd, 0x46db, { 0xa5, 0xe5, 0x5a, 0x12, 0x4c, 0x83, 0x23, 0x23 } }

 

-#define EDKII_SD_MMC_OVERRIDE_PROTOCOL_VERSION    0x3

+#define EDKII_SD_MMC_OVERRIDE_PROTOCOL_VERSION  0x3

 

 typedef struct _EDKII_SD_MMC_OVERRIDE EDKII_SD_MMC_OVERRIDE;

 

-#define EDKII_SD_MMC_BUS_WIDTH_IGNORE MAX_UINT8

-#define EDKII_SD_MMC_CLOCK_FREQ_IGNORE MAX_UINT32

+#define EDKII_SD_MMC_BUS_WIDTH_IGNORE        MAX_UINT8

+#define EDKII_SD_MMC_CLOCK_FREQ_IGNORE       MAX_UINT32

 #define EDKII_SD_MMC_DRIVER_STRENGTH_IGNORE  MAX_UINT8

 

 typedef enum {

-  SdDriverStrengthTypeB        = 0,

+  SdDriverStrengthTypeB = 0,

   SdDriverStrengthTypeA,

   SdDriverStrengthTypeC,

   SdDriverStrengthTypeD,

@@ -33,7 +33,7 @@ typedef enum {
 } SD_DRIVER_STRENGTH_TYPE;

 

 typedef enum {

-  EmmcDriverStrengthType0      = 0,

+  EmmcDriverStrengthType0 = 0,

   EmmcDriverStrengthType1,

   EmmcDriverStrengthType2,

   EmmcDriverStrengthType3,

@@ -52,20 +52,20 @@ typedef struct {
   // or specifies unsupported width driver will choose highest supported

   // bus width for a given mode.

   //

-  UINT8                         BusWidth;

+  UINT8                           BusWidth;

   //

   // The target clock frequency of the bus in MHz. If user tells driver to ignore

   // it or specifies unsupported frequency driver will choose highest supported

   // clock frequency for a given mode.

   //

-  UINT32                        ClockFreq;

+  UINT32                          ClockFreq;

   //

   // The target driver strength of the bus. If user tells driver to

   // ignore it or specifies unsupported driver strength, driver will

   // default to Type0 for eMMC cards and TypeB for SD cards. Driver strength

   // setting is only considered if chosen bus timing supports them.

   //

-  EDKII_SD_MMC_DRIVER_STRENGTH  DriverStrength;

+  EDKII_SD_MMC_DRIVER_STRENGTH    DriverStrength;

 } EDKII_SD_MMC_OPERATING_PARAMETERS;

 

 typedef enum {

@@ -109,7 +109,7 @@ typedef enum {
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_SD_MMC_CAPABILITY) (

+(EFIAPI *EDKII_SD_MMC_CAPABILITY)(

   IN      EFI_HANDLE                      ControllerHandle,

   IN      UINT8                           Slot,

   IN OUT  VOID                            *SdMmcHcSlotCapability,

@@ -133,7 +133,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_SD_MMC_NOTIFY_PHASE) (

+(EFIAPI *EDKII_SD_MMC_NOTIFY_PHASE)(

   IN      EFI_HANDLE                      ControllerHandle,

   IN      UINT8                           Slot,

   IN      EDKII_SD_MMC_PHASE_TYPE         PhaseType,

@@ -144,17 +144,17 @@ struct _EDKII_SD_MMC_OVERRIDE {
   //

   // Protocol version of this implementation

   //

-  UINTN                         Version;

+  UINTN                        Version;

   //

   // Callback to override SD/MMC host controller capability bits

   //

-  EDKII_SD_MMC_CAPABILITY       Capability;

+  EDKII_SD_MMC_CAPABILITY      Capability;

   //

   // Callback to invoke SD/MMC override hooks

   //

-  EDKII_SD_MMC_NOTIFY_PHASE     NotifyPhase;

+  EDKII_SD_MMC_NOTIFY_PHASE    NotifyPhase;

 };

 

-extern EFI_GUID gEdkiiSdMmcOverrideProtocolGuid;

+extern EFI_GUID  gEdkiiSdMmcOverrideProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmExitBootServices.h b/MdeModulePkg/Include/Protocol/SmmExitBootServices.h
index 27d8b5e..ec8e754 100644
--- a/MdeModulePkg/Include/Protocol/SmmExitBootServices.h
+++ b/MdeModulePkg/Include/Protocol/SmmExitBootServices.h
@@ -18,6 +18,6 @@
     0x296eb418, 0xc4c8, 0x4e05, { 0xab, 0x59, 0x39, 0xe8, 0xaf, 0x56, 0xf0, 0xa } \

   }

 

-extern EFI_GUID gEdkiiSmmExitBootServicesProtocolGuid;

+extern EFI_GUID  gEdkiiSmmExitBootServicesProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h b/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
index 63bc3a1..39fc0cb 100644
--- a/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
+++ b/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
@@ -27,6 +27,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 typedef EFI_FAULT_TOLERANT_WRITE_PROTOCOL EFI_SMM_FAULT_TOLERANT_WRITE_PROTOCOL;

 

-extern EFI_GUID gEfiSmmFaultTolerantWriteProtocolGuid;

+extern EFI_GUID  gEfiSmmFaultTolerantWriteProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h b/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
index d18c2dc..032b5cb 100644
--- a/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
+++ b/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
@@ -25,6 +25,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_SMM_FIRMWARE_VOLUME_BLOCK_PROTOCOL;

 

-extern EFI_GUID gEfiSmmFirmwareVolumeBlockProtocolGuid;

+extern EFI_GUID  gEfiSmmFirmwareVolumeBlockProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h b/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h
index ecff9ab..4f415cc 100644
--- a/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h
+++ b/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h
@@ -17,6 +17,6 @@
     0x85a8ab57, 0x644, 0x4110, { 0x85, 0xf, 0x98, 0x13, 0x22, 0x4, 0x70, 0x70 } \

   }

 

-extern EFI_GUID gEdkiiSmmLegacyBootProtocolGuid;

+extern EFI_GUID  gEdkiiSmmLegacyBootProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmMemoryAttribute.h b/MdeModulePkg/Include/Protocol/SmmMemoryAttribute.h
index 7e45fb9..0a8b251 100644
--- a/MdeModulePkg/Include/Protocol/SmmMemoryAttribute.h
+++ b/MdeModulePkg/Include/Protocol/SmmMemoryAttribute.h
@@ -10,7 +10,7 @@
 #ifndef __SMM_MEMORYATTRIBUTE_H__

 #define __SMM_MEMORYATTRIBUTE_H__

 

-//{69B792EA-39CE-402D-A2A6-F721DE351DFE}

+// {69B792EA-39CE-402D-A2A6-F721DE351DFE}

 #define EDKII_SMM_MEMORY_ATTRIBUTE_PROTOCOL_GUID \

   { \

     0x69b792ea, 0x39ce, 0x402d, { 0xa2, 0xa6, 0xf7, 0x21, 0xde, 0x35, 0x1d, 0xfe } \

@@ -117,11 +117,11 @@ EFI_STATUS
 /// attribute of memory in the EFI SMM environment.

 ///

 struct _EDKII_SMM_MEMORY_ATTRIBUTE_PROTOCOL {

-  EDKII_SMM_GET_MEMORY_ATTRIBUTES       GetMemoryAttributes;

-  EDKII_SMM_SET_MEMORY_ATTRIBUTES       SetMemoryAttributes;

-  EDKII_SMM_CLEAR_MEMORY_ATTRIBUTES     ClearMemoryAttributes;

+  EDKII_SMM_GET_MEMORY_ATTRIBUTES      GetMemoryAttributes;

+  EDKII_SMM_SET_MEMORY_ATTRIBUTES      SetMemoryAttributes;

+  EDKII_SMM_CLEAR_MEMORY_ATTRIBUTES    ClearMemoryAttributes;

 };

 

-extern EFI_GUID gEdkiiSmmMemoryAttributeProtocolGuid;

+extern EFI_GUID  gEdkiiSmmMemoryAttributeProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h b/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h
index 0b49952..5603050 100644
--- a/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h
+++ b/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h
@@ -18,6 +18,6 @@
     0x6e057ecf, 0xfa99, 0x4f39, { 0x95, 0xbc, 0x59, 0xf9, 0x92, 0x1d, 0x17, 0xe4 } \

   }

 

-extern EFI_GUID gEdkiiSmmReadyToBootProtocolGuid;

+extern EFI_GUID  gEdkiiSmmReadyToBootProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h b/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
index d2c9fc5..80697e1 100644
--- a/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
+++ b/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
@@ -29,6 +29,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 typedef EFI_SWAP_ADDRESS_RANGE_PROTOCOL EFI_SMM_SWAP_ADDRESS_RANGE_PROTOCOL;

 

-extern EFI_GUID gEfiSmmSwapAddressRangeProtocolGuid;

+extern EFI_GUID  gEfiSmmSwapAddressRangeProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SmmVarCheck.h b/MdeModulePkg/Include/Protocol/SmmVarCheck.h
index 269a407..4b601f2 100644
--- a/MdeModulePkg/Include/Protocol/SmmVarCheck.h
+++ b/MdeModulePkg/Include/Protocol/SmmVarCheck.h
@@ -19,12 +19,11 @@
 typedef struct _EDKII_SMM_VAR_CHECK_PROTOCOL EDKII_SMM_VAR_CHECK_PROTOCOL;

 

 struct _EDKII_SMM_VAR_CHECK_PROTOCOL {

-  EDKII_VAR_CHECK_REGISTER_SET_VARIABLE_CHECK_HANDLER   SmmRegisterSetVariableCheckHandler;

-  EDKII_VAR_CHECK_VARIABLE_PROPERTY_SET                 SmmVariablePropertySet;

-  EDKII_VAR_CHECK_VARIABLE_PROPERTY_GET                 SmmVariablePropertyGet;

+  EDKII_VAR_CHECK_REGISTER_SET_VARIABLE_CHECK_HANDLER    SmmRegisterSetVariableCheckHandler;

+  EDKII_VAR_CHECK_VARIABLE_PROPERTY_SET                  SmmVariablePropertySet;

+  EDKII_VAR_CHECK_VARIABLE_PROPERTY_GET                  SmmVariablePropertyGet;

 };

 

-extern EFI_GUID gEdkiiSmmVarCheckProtocolGuid;

+extern EFI_GUID  gEdkiiSmmVarCheckProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/SmmVariable.h b/MdeModulePkg/Include/Protocol/SmmVariable.h
index 9d57343..7f65708 100644
--- a/MdeModulePkg/Include/Protocol/SmmVariable.h
+++ b/MdeModulePkg/Include/Protocol/SmmVariable.h
@@ -15,19 +15,19 @@
     0xed32d533, 0x99e6, 0x4209, { 0x9c, 0xc0, 0x2d, 0x72, 0xcd, 0xd9, 0x98, 0xa7 } \

   }

 

-typedef struct _EFI_SMM_VARIABLE_PROTOCOL  EFI_SMM_VARIABLE_PROTOCOL;

+typedef struct _EFI_SMM_VARIABLE_PROTOCOL EFI_SMM_VARIABLE_PROTOCOL;

 

 ///

 /// EFI SMM Variable Protocol is intended for use as a means

 /// to store data in the EFI SMM environment.

 ///

 struct _EFI_SMM_VARIABLE_PROTOCOL {

-  EFI_GET_VARIABLE            SmmGetVariable;

-  EFI_GET_NEXT_VARIABLE_NAME  SmmGetNextVariableName;

-  EFI_SET_VARIABLE            SmmSetVariable;

-  EFI_QUERY_VARIABLE_INFO     SmmQueryVariableInfo;

+  EFI_GET_VARIABLE              SmmGetVariable;

+  EFI_GET_NEXT_VARIABLE_NAME    SmmGetNextVariableName;

+  EFI_SET_VARIABLE              SmmSetVariable;

+  EFI_QUERY_VARIABLE_INFO       SmmQueryVariableInfo;

 };

 

-extern EFI_GUID gEfiSmmVariableProtocolGuid;

+extern EFI_GUID  gEfiSmmVariableProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/SwapAddressRange.h b/MdeModulePkg/Include/Protocol/SwapAddressRange.h
index fb01dbf..0539877 100644
--- a/MdeModulePkg/Include/Protocol/SwapAddressRange.h
+++ b/MdeModulePkg/Include/Protocol/SwapAddressRange.h
@@ -21,7 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EFI_SWAP_ADDRESS_RANGE_PROTOCOL  EFI_SWAP_ADDRESS_RANGE_PROTOCOL;

+typedef struct _EFI_SWAP_ADDRESS_RANGE_PROTOCOL EFI_SWAP_ADDRESS_RANGE_PROTOCOL;

 

 #define EFI_UNSUPPORT_LOCK  0

 #define EFI_SOFTWARE_LOCK   1

@@ -93,8 +93,6 @@ EFI_STATUS
   IN BOOLEAN                                    NewSwapState

   );

 

-

-

 /**

   This service checks if a Real Time Clock (RTC) power failure happened.

 

@@ -132,8 +130,6 @@ EFI_STATUS
   OUT EFI_SWAP_LOCK_CAPABILITY                  *LockCapability

   );

 

-

-

 /**

   This service is used to acquire or release appointed kind of lock for Swap Address Range operations.

 

@@ -155,14 +151,14 @@ EFI_STATUS
   );

 

 struct _EFI_SWAP_ADDRESS_RANGE_PROTOCOL {

-  EFI_GET_RANGE_LOCATION        GetRangeLocation;       // has output parameters for base and length

-  EFI_GET_SWAP_STATE            GetSwapState;           // are ranges swapped or not

-  EFI_SET_SWAP_STATE            SetSwapState;           // swap or unswap ranges

-  EFI_GET_RTC_POWER_STATUS      GetRtcPowerStatus;      // checks RTC battery, or whatever...

-  EFI_GET_SWAP_LOCK_CAPABILITY  GetSwapLockCapability;  // Get TOP_SWAP lock capability,

-  EFI_SET_SWAP_LOCK             SetSwapLock;            // Set TOP_SWAP lock state

+  EFI_GET_RANGE_LOCATION          GetRangeLocation;      // has output parameters for base and length

+  EFI_GET_SWAP_STATE              GetSwapState;          // are ranges swapped or not

+  EFI_SET_SWAP_STATE              SetSwapState;          // swap or unswap ranges

+  EFI_GET_RTC_POWER_STATUS        GetRtcPowerStatus;     // checks RTC battery, or whatever...

+  EFI_GET_SWAP_LOCK_CAPABILITY    GetSwapLockCapability; // Get TOP_SWAP lock capability,

+  EFI_SET_SWAP_LOCK               SetSwapLock;           // Set TOP_SWAP lock state

 };

 

-extern EFI_GUID gEfiSwapAddressRangeProtocolGuid;

+extern EFI_GUID  gEfiSwapAddressRangeProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/UfsHostController.h b/MdeModulePkg/Include/Protocol/UfsHostController.h
index ba51938..e0e00f0 100644
--- a/MdeModulePkg/Include/Protocol/UfsHostController.h
+++ b/MdeModulePkg/Include/Protocol/UfsHostController.h
@@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #ifndef __EDKII_UFS_HC_PROTOCOL_H__

 #define __EDKII_UFS_HC_PROTOCOL_H__

 

@@ -22,8 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // Forward reference for pure ANSI compatability

 //

-typedef struct _EDKII_UFS_HOST_CONTROLLER_PROTOCOL  EDKII_UFS_HOST_CONTROLLER_PROTOCOL;

-

+typedef struct _EDKII_UFS_HOST_CONTROLLER_PROTOCOL EDKII_UFS_HOST_CONTROLLER_PROTOCOL;

 

 /**

   Get the MMIO base address of UFS host controller.

@@ -39,7 +37,7 @@ typedef
 EFI_STATUS

 (EFIAPI *EDKII_UFS_HC_GET_MMIO_BAR)(

   IN     EDKII_UFS_HOST_CONTROLLER_PROTOCOL     *This,

-     OUT UINTN                                  *MmioBar

+  OUT UINTN                                  *MmioBar

   );

 

 ///

@@ -90,8 +88,8 @@ EFI_STATUS
   IN     EDKII_UFS_HOST_CONTROLLER_OPERATION  Operation,

   IN     VOID                                 *HostAddress,

   IN OUT UINTN                                *NumberOfBytes,

-     OUT EFI_PHYSICAL_ADDRESS                 *DeviceAddress,

-     OUT VOID                                 **Mapping

+  OUT EFI_PHYSICAL_ADDRESS                 *DeviceAddress,

+  OUT VOID                                 **Mapping

   );

 

 /**

@@ -138,7 +136,7 @@ EFI_STATUS
   IN     EFI_ALLOCATE_TYPE                    Type,

   IN     EFI_MEMORY_TYPE                      MemoryType,

   IN     UINTN                                Pages,

-     OUT VOID                                 **HostAddress,

+  OUT VOID                                 **HostAddress,

   IN     UINT64                               Attributes

   );

 

@@ -180,7 +178,7 @@ EFI_STATUS
   );

 

 typedef enum {

-  EfiUfsHcWidthUint8      = 0,

+  EfiUfsHcWidthUint8 = 0,

   EfiUfsHcWidthUint16,

   EfiUfsHcWidthUint32,

   EfiUfsHcWidthUint64,

@@ -219,19 +217,19 @@ EFI_STATUS
 ///  UFS Host Controller Protocol structure.

 ///

 struct _EDKII_UFS_HOST_CONTROLLER_PROTOCOL {

-  EDKII_UFS_HC_GET_MMIO_BAR           GetUfsHcMmioBar;

-  EDKII_UFS_HC_ALLOCATE_BUFFER        AllocateBuffer;

-  EDKII_UFS_HC_FREE_BUFFER            FreeBuffer;

-  EDKII_UFS_HC_MAP                    Map;

-  EDKII_UFS_HC_UNMAP                  Unmap;

-  EDKII_UFS_HC_FLUSH                  Flush;

-  EDKII_UFS_HC_MMIO_READ_WRITE        Read;

-  EDKII_UFS_HC_MMIO_READ_WRITE        Write;

+  EDKII_UFS_HC_GET_MMIO_BAR       GetUfsHcMmioBar;

+  EDKII_UFS_HC_ALLOCATE_BUFFER    AllocateBuffer;

+  EDKII_UFS_HC_FREE_BUFFER        FreeBuffer;

+  EDKII_UFS_HC_MAP                Map;

+  EDKII_UFS_HC_UNMAP              Unmap;

+  EDKII_UFS_HC_FLUSH              Flush;

+  EDKII_UFS_HC_MMIO_READ_WRITE    Read;

+  EDKII_UFS_HC_MMIO_READ_WRITE    Write;

 };

 

 ///

 ///  UFS Host Controller Protocol GUID variable.

 ///

-extern EFI_GUID gEdkiiUfsHostControllerProtocolGuid;

+extern EFI_GUID  gEdkiiUfsHostControllerProtocolGuid;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/UfsHostControllerPlatform.h b/MdeModulePkg/Include/Protocol/UfsHostControllerPlatform.h
index 0f6732a..faa82d0 100644
--- a/MdeModulePkg/Include/Protocol/UfsHostControllerPlatform.h
+++ b/MdeModulePkg/Include/Protocol/UfsHostControllerPlatform.h
@@ -11,19 +11,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 #include <Protocol/UfsHostController.h>

 

-#define EDKII_UFS_HC_PLATFORM_PROTOCOL_VERSION 1

+#define EDKII_UFS_HC_PLATFORM_PROTOCOL_VERSION  1

 

 extern EFI_GUID  gEdkiiUfsHcPlatformProtocolGuid;

 

-typedef struct _EDKII_UFS_HC_PLATFORM_PROTOCOL  EDKII_UFS_HC_PLATFORM_PROTOCOL;

+typedef struct _EDKII_UFS_HC_PLATFORM_PROTOCOL EDKII_UFS_HC_PLATFORM_PROTOCOL;

 

-typedef struct _EDKII_UFS_HC_DRIVER_INTERFACE  EDKII_UFS_HC_DRIVER_INTERFACE;

+typedef struct _EDKII_UFS_HC_DRIVER_INTERFACE EDKII_UFS_HC_DRIVER_INTERFACE;

 

 typedef struct {

-  UINT32 Opcode;

-  UINT32 Arg1;

-  UINT32 Arg2;

-  UINT32 Arg3;

+  UINT32    Opcode;

+  UINT32    Arg1;

+  UINT32    Arg2;

+  UINT32    Arg3;

 } EDKII_UIC_COMMAND;

 

 /**

@@ -38,25 +38,25 @@ typedef struct {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EDKII_UFS_EXEC_UIC_COMMAND) (

+(EFIAPI *EDKII_UFS_EXEC_UIC_COMMAND)(

   IN      EDKII_UFS_HC_DRIVER_INTERFACE  *This,

   IN OUT  EDKII_UIC_COMMAND              *UicCommand

-);

+  );

 

 struct _EDKII_UFS_HC_DRIVER_INTERFACE {

   ///

   /// Protocol to accesss host controller MMIO and PCI registers.

   ///

-  EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHcProtocol;

+  EDKII_UFS_HOST_CONTROLLER_PROTOCOL    *UfsHcProtocol;

   ///

   /// Function implementing UIC command execution.

   ///

-  EDKII_UFS_EXEC_UIC_COMMAND          UfsExecUicCommand;

+  EDKII_UFS_EXEC_UIC_COMMAND            UfsExecUicCommand;

 };

 

 typedef struct {

-  UINT32 Capabilities;

-  UINT32 Version;

+  UINT32    Capabilities;

+  UINT32    Version;

 } EDKII_UFS_HC_INFO;

 

 /**

@@ -71,10 +71,10 @@ typedef struct {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EDKII_UFS_HC_PLATFORM_OVERRIDE_HC_INFO) (

+(EFIAPI *EDKII_UFS_HC_PLATFORM_OVERRIDE_HC_INFO)(

   IN     EFI_HANDLE         ControllerHandle,

   IN OUT EDKII_UFS_HC_INFO  *HcInfo

-);

+  );

 

 typedef enum {

   EdkiiUfsHcPreHce,

@@ -98,27 +98,26 @@ typedef enum {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EDKII_UFS_HC_PLATFORM_CALLBACK) (

+(EFIAPI *EDKII_UFS_HC_PLATFORM_CALLBACK)(

   IN     EFI_HANDLE                            ControllerHandle,

   IN     EDKII_UFS_HC_PLATFORM_CALLBACK_PHASE  CallbackPhase,

   IN OUT VOID                                  *CallbackData

-);

+  );

 

 struct _EDKII_UFS_HC_PLATFORM_PROTOCOL {

   ///

   /// Version of the protocol.

   ///

-  UINT32                                  Version;

+  UINT32                                    Version;

   ///

   /// Allows platform driver to override host controller information.

   ///

-  EDKII_UFS_HC_PLATFORM_OVERRIDE_HC_INFO  OverrideHcInfo;

+  EDKII_UFS_HC_PLATFORM_OVERRIDE_HC_INFO    OverrideHcInfo;

   ///

   /// Allows platform driver to implement platform specific flows

   /// for host controller.

   ///

-  EDKII_UFS_HC_PLATFORM_CALLBACK          Callback;

+  EDKII_UFS_HC_PLATFORM_CALLBACK            Callback;

 };

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/VarCheck.h b/MdeModulePkg/Include/Protocol/VarCheck.h
index 013ec6f..bb3db5b 100644
--- a/MdeModulePkg/Include/Protocol/VarCheck.h
+++ b/MdeModulePkg/Include/Protocol/VarCheck.h
@@ -11,9 +11,9 @@
 

 #include <Uefi/UefiSpec.h>

 

-typedef struct _EDKII_VAR_CHECK_PROTOCOL    EDKII_VAR_CHECK_PROTOCOL;

+typedef struct _EDKII_VAR_CHECK_PROTOCOL EDKII_VAR_CHECK_PROTOCOL;

 

-#define EDKII_VAR_CHECK_PROTOCOL_GUID { \

+#define EDKII_VAR_CHECK_PROTOCOL_GUID  {\

   0xaf23b340, 0x97b4, 0x4685, { 0x8d, 0x4f, 0xa3, 0xf2, 0x81, 0x69, 0xb2, 0x1d } \

 };

 

@@ -36,31 +36,31 @@ typedef EFI_SET_VARIABLE VAR_CHECK_SET_VARIABLE_CHECK_HANDLER;
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_VAR_CHECK_REGISTER_SET_VARIABLE_CHECK_HANDLER) (

+(EFIAPI *EDKII_VAR_CHECK_REGISTER_SET_VARIABLE_CHECK_HANDLER)(

   IN VAR_CHECK_SET_VARIABLE_CHECK_HANDLER   Handler

   );

 

-#define VAR_CHECK_VARIABLE_PROPERTY_REVISION      0x0001

+#define VAR_CHECK_VARIABLE_PROPERTY_REVISION  0x0001

 //

 // 1. Set by VariableLock PROTOCOL

 // 2. Set by VarCheck PROTOCOL

 //

 // If set, other fields for check will be ignored.

 //

-#define VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY     BIT0

+#define VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY  BIT0

 

 typedef struct {

-  UINT16                            Revision;

-  UINT16                            Property;

-  UINT32                            Attributes;

-  UINTN                             MinSize;

-  UINTN                             MaxSize;

+  UINT16    Revision;

+  UINT16    Property;

+  UINT32    Attributes;

+  UINTN     MinSize;

+  UINTN     MaxSize;

 } VAR_CHECK_VARIABLE_PROPERTY;

 

 typedef struct {

-  EFI_GUID                      *Guid;

-  CHAR16                        *Name;

-  VAR_CHECK_VARIABLE_PROPERTY   VariableProperty;

+  EFI_GUID                       *Guid;

+  CHAR16                         *Name;

+  VAR_CHECK_VARIABLE_PROPERTY    VariableProperty;

 } VARIABLE_ENTRY_PROPERTY;

 

 /**

@@ -82,7 +82,7 @@ typedef struct {
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_VAR_CHECK_VARIABLE_PROPERTY_SET) (

+(EFIAPI *EDKII_VAR_CHECK_VARIABLE_PROPERTY_SET)(

   IN CHAR16                         *Name,

   IN EFI_GUID                       *Guid,

   IN VAR_CHECK_VARIABLE_PROPERTY    *VariableProperty

@@ -102,19 +102,18 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_VAR_CHECK_VARIABLE_PROPERTY_GET) (

+(EFIAPI *EDKII_VAR_CHECK_VARIABLE_PROPERTY_GET)(

   IN CHAR16                         *Name,

   IN EFI_GUID                       *Guid,

   OUT VAR_CHECK_VARIABLE_PROPERTY   *VariableProperty

   );

 

 struct _EDKII_VAR_CHECK_PROTOCOL {

-  EDKII_VAR_CHECK_REGISTER_SET_VARIABLE_CHECK_HANDLER   RegisterSetVariableCheckHandler;

-  EDKII_VAR_CHECK_VARIABLE_PROPERTY_SET                 VariablePropertySet;

-  EDKII_VAR_CHECK_VARIABLE_PROPERTY_GET                 VariablePropertyGet;

+  EDKII_VAR_CHECK_REGISTER_SET_VARIABLE_CHECK_HANDLER    RegisterSetVariableCheckHandler;

+  EDKII_VAR_CHECK_VARIABLE_PROPERTY_SET                  VariablePropertySet;

+  EDKII_VAR_CHECK_VARIABLE_PROPERTY_GET                  VariablePropertyGet;

 };

 

-extern EFI_GUID gEdkiiVarCheckProtocolGuid;

+extern EFI_GUID  gEdkiiVarCheckProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/VariableLock.h b/MdeModulePkg/Include/Protocol/VariableLock.h
index eaffd5b..2d15cc1 100644
--- a/MdeModulePkg/Include/Protocol/VariableLock.h
+++ b/MdeModulePkg/Include/Protocol/VariableLock.h
@@ -16,7 +16,7 @@
     0xcd3d0a05, 0x9e24, 0x437c, { 0xa8, 0x91, 0x1e, 0xe0, 0x53, 0xdb, 0x76, 0x38 } \

   }

 

-typedef struct _EDKII_VARIABLE_LOCK_PROTOCOL  EDKII_VARIABLE_LOCK_PROTOCOL;

+typedef struct _EDKII_VARIABLE_LOCK_PROTOCOL EDKII_VARIABLE_LOCK_PROTOCOL;

 

 /**

   Mark a variable that will become read-only after leaving the DXE phase of execution.

@@ -36,7 +36,7 @@ typedef struct _EDKII_VARIABLE_LOCK_PROTOCOL  EDKII_VARIABLE_LOCK_PROTOCOL;
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_VARIABLE_LOCK_PROTOCOL_REQUEST_TO_LOCK) (

+(EFIAPI *EDKII_VARIABLE_LOCK_PROTOCOL_REQUEST_TO_LOCK)(

   IN CONST EDKII_VARIABLE_LOCK_PROTOCOL *This,

   IN       CHAR16                       *VariableName,

   IN       EFI_GUID                     *VendorGuid

@@ -48,10 +48,9 @@ EFI_STATUS
 /// EFI_END_OF_DXE_EVENT_GUID is signaled.

 ///

 struct _EDKII_VARIABLE_LOCK_PROTOCOL {

-  EDKII_VARIABLE_LOCK_PROTOCOL_REQUEST_TO_LOCK RequestToLock;

+  EDKII_VARIABLE_LOCK_PROTOCOL_REQUEST_TO_LOCK    RequestToLock;

 };

 

-extern EFI_GUID gEdkiiVariableLockProtocolGuid;

+extern EFI_GUID  gEdkiiVariableLockProtocolGuid;

 

 #endif

-

diff --git a/MdeModulePkg/Include/Protocol/VariablePolicy.h b/MdeModulePkg/Include/Protocol/VariablePolicy.h
index 8226c18..98d7394 100644
--- a/MdeModulePkg/Include/Protocol/VariablePolicy.h
+++ b/MdeModulePkg/Include/Protocol/VariablePolicy.h
@@ -9,35 +9,35 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __EDKII_VARIABLE_POLICY_PROTOCOL__

 #define __EDKII_VARIABLE_POLICY_PROTOCOL__

 

-#define EDKII_VARIABLE_POLICY_PROTOCOL_REVISION   0x0000000000010000

+#define EDKII_VARIABLE_POLICY_PROTOCOL_REVISION  0x0000000000010000

 

 #define EDKII_VARIABLE_POLICY_PROTOCOL_GUID \

   { \

     0x81D1675C, 0x86F6, 0x48DF, { 0xBD, 0x95, 0x9A, 0x6E, 0x4F, 0x09, 0x25, 0xC3 } \

   }

 

-#define VARIABLE_POLICY_ENTRY_REVISION      0x00010000

+#define VARIABLE_POLICY_ENTRY_REVISION  0x00010000

 

 #pragma pack(push, 1)

 typedef struct {

-  UINT32   Version;

-  UINT16   Size;

-  UINT16   OffsetToName;

-  EFI_GUID Namespace;

-  UINT32   MinSize;

-  UINT32   MaxSize;

-  UINT32   AttributesMustHave;

-  UINT32   AttributesCantHave;

-  UINT8    LockPolicyType;

-  UINT8    Padding[3];

+  UINT32      Version;

+  UINT16      Size;

+  UINT16      OffsetToName;

+  EFI_GUID    Namespace;

+  UINT32      MinSize;

+  UINT32      MaxSize;

+  UINT32      AttributesMustHave;

+  UINT32      AttributesCantHave;

+  UINT8       LockPolicyType;

+  UINT8       Padding[3];

   // UINT8    LockPolicy[];     // Variable Length Field

   // CHAR16   Name[]            // Variable Length Field

 } VARIABLE_POLICY_ENTRY;

 

-#define     VARIABLE_POLICY_NO_MIN_SIZE             0

-#define     VARIABLE_POLICY_NO_MAX_SIZE             MAX_UINT32

-#define     VARIABLE_POLICY_NO_MUST_ATTR            0

-#define     VARIABLE_POLICY_NO_CANT_ATTR            0

+#define     VARIABLE_POLICY_NO_MIN_SIZE   0

+#define     VARIABLE_POLICY_NO_MAX_SIZE   MAX_UINT32

+#define     VARIABLE_POLICY_NO_MUST_ATTR  0

+#define     VARIABLE_POLICY_NO_CANT_ATTR  0

 

 #define     VARIABLE_POLICY_TYPE_NO_LOCK            0

 #define     VARIABLE_POLICY_TYPE_LOCK_NOW           1

@@ -45,9 +45,9 @@ typedef struct {
 #define     VARIABLE_POLICY_TYPE_LOCK_ON_VAR_STATE  3

 

 typedef struct {

-  EFI_GUID Namespace;

-  UINT8    Value;

-  UINT8    Padding;

+  EFI_GUID    Namespace;

+  UINT8       Value;

+  UINT8       Padding;

   // CHAR16   Name[];           // Variable Length Field

 } VARIABLE_LOCK_ON_VAR_STATE_POLICY;

 #pragma pack(pop)

@@ -142,16 +142,16 @@ EFI_STATUS
   );

 

 typedef struct {

-  UINT64                     Revision;

-  DISABLE_VARIABLE_POLICY    DisableVariablePolicy;

-  IS_VARIABLE_POLICY_ENABLED IsVariablePolicyEnabled;

-  REGISTER_VARIABLE_POLICY   RegisterVariablePolicy;

-  DUMP_VARIABLE_POLICY       DumpVariablePolicy;

-  LOCK_VARIABLE_POLICY       LockVariablePolicy;

+  UINT64                        Revision;

+  DISABLE_VARIABLE_POLICY       DisableVariablePolicy;

+  IS_VARIABLE_POLICY_ENABLED    IsVariablePolicyEnabled;

+  REGISTER_VARIABLE_POLICY      RegisterVariablePolicy;

+  DUMP_VARIABLE_POLICY          DumpVariablePolicy;

+  LOCK_VARIABLE_POLICY          LockVariablePolicy;

 } _EDKII_VARIABLE_POLICY_PROTOCOL;

 

 typedef _EDKII_VARIABLE_POLICY_PROTOCOL EDKII_VARIABLE_POLICY_PROTOCOL;

 

-extern EFI_GUID gEdkiiVariablePolicyProtocolGuid;

+extern EFI_GUID  gEdkiiVariablePolicyProtocolGuid;

 

 #endif