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>

2 files changed, 430 insertions, 412 deletions

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
index afc41ed..3684007 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
@@ -6,6 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

+

 #ifndef _INTERNAL_SMM_S3_SAVE_STATE_H_

 #define _INTERNAL_SMM_S3_SAVE_STATE_H_

 #include <PiDxe.h>

@@ -20,6 +21,7 @@
 #include <Library/PcdLib.h>

 #include <Library/SmbusLib.h>

 #include <IndustryStandard/SmBus.h>

+

 /**

   Adds a record into S3 boot script table.

 

@@ -50,10 +52,11 @@
 EFI_STATUS

 EFIAPI

 BootScriptWrite (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,

-  IN       UINTN                            OpCode,

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL  *This,

+  IN       UINTN                       OpCode,

   ...

   );

+

 /**

   Insert a record into a specified Framework boot script table.

 

@@ -85,12 +88,13 @@ BootScriptWrite (
 EFI_STATUS

 EFIAPI

 BootScriptInsert (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,

-  IN       BOOLEAN                          BeforeOrAfter,

-  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION     *Position OPTIONAL,

-  IN       UINTN                            OpCode,

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL   *This,

+  IN       BOOLEAN                      BeforeOrAfter,

+  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION  *Position OPTIONAL,

+  IN       UINTN                        OpCode,

   ...

   );

+

 /**

   Find a label within the boot script table and, if not present, optionally create it.

 

@@ -120,12 +124,13 @@ BootScriptInsert (
 EFI_STATUS

 EFIAPI

 BootScriptLabel (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL           *This,

-  IN       BOOLEAN                               BeforeOrAfter,

-  IN       BOOLEAN                               CreateIfNotFound,

-  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION          *Position OPTIONAL,

-  IN CONST CHAR8                                *Label

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL   *This,

+  IN       BOOLEAN                      BeforeOrAfter,

+  IN       BOOLEAN                      CreateIfNotFound,

+  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION  *Position OPTIONAL,

+  IN CONST CHAR8                        *Label

   );

+

 /**

   Compare two positions in the boot script table and return their relative position.

 

@@ -145,10 +150,10 @@ BootScriptLabel (
 EFI_STATUS

 EFIAPI

 BootScriptCompare (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,

-  IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,

-  IN       EFI_S3_BOOT_SCRIPT_POSITION      Position2,

-  OUT      UINTN                           *RelativePosition

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL   *This,

+  IN       EFI_S3_BOOT_SCRIPT_POSITION  Position1,

+  IN       EFI_S3_BOOT_SCRIPT_POSITION  Position2,

+  OUT      UINTN                        *RelativePosition

   );

 

 #endif //_INTERNAL_SMM_S3_SAVE_STATE_H_

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index 601c821..bf5a2ae 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
@@ -8,12 +8,13 @@
 **/

 #include "InternalSmmSaveState.h"

 

-EFI_S3_SMM_SAVE_STATE_PROTOCOL    mS3SmmSaveState = {

-   BootScriptWrite,

-   BootScriptInsert,

-   BootScriptLabel,

-   BootScriptCompare

-  };

+EFI_S3_SMM_SAVE_STATE_PROTOCOL  mS3SmmSaveState = {

+  BootScriptWrite,

+  BootScriptInsert,

+  BootScriptLabel,

+  BootScriptCompare

+};

+

 /**

   Internal function to add IO write opcode to the table.

 

@@ -26,21 +27,22 @@ EFI_S3_SMM_SAVE_STATE_PROTOCOL    mS3SmmSaveState = {
 **/

 EFI_STATUS

 BootScriptWriteIoWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINTN                 Count;

-  UINT8                 *Buffer;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINTN                     Count;

+  UINT8                     *Buffer;

 

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Address     = VA_ARG (Marker, UINT64);

-  Count       = VA_ARG (Marker, UINTN);

-  Buffer      = VA_ARG (Marker, UINT8 *);

+  Width   = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address = VA_ARG (Marker, UINT64);

+  Count   = VA_ARG (Marker, UINTN);

+  Buffer  = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);

 }

+

 /**

   Internal function to add IO read/write opcode to the table.

 

@@ -53,18 +55,18 @@ BootScriptWriteIoWrite (
 **/

 EFI_STATUS

 BootScriptWriteIoReadWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINT8                 *Data;

-  UINT8                 *DataMask;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINT8                     *Data;

+  UINT8                     *DataMask;

 

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Address     = VA_ARG (Marker, UINT64);

-  Data        = VA_ARG (Marker, UINT8 *);

-  DataMask    = VA_ARG (Marker, UINT8 *);

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, UINT8 *);

+  DataMask = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);

 }

@@ -81,18 +83,18 @@ BootScriptWriteIoReadWrite (
 **/

 EFI_STATUS

 BootScriptWriteMemWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINTN                 Count;

-  UINT8                 *Buffer;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINTN                     Count;

+  UINT8                     *Buffer;

 

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Address     = VA_ARG (Marker, UINT64);

-  Count       = VA_ARG (Marker, UINTN);

-  Buffer      = VA_ARG (Marker, UINT8 *);

+  Width   = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address = VA_ARG (Marker, UINT64);

+  Count   = VA_ARG (Marker, UINTN);

+  Buffer  = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSaveMemWrite (Width, Address, Count, Buffer);

 }

@@ -109,18 +111,18 @@ BootScriptWriteMemWrite (
 **/

 EFI_STATUS

 BootScriptWriteMemReadWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINT8                 *Data;

-  UINT8                 *DataMask;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINT8                     *Data;

+  UINT8                     *DataMask;

 

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Address     = VA_ARG (Marker, UINT64);

-  Data        = VA_ARG (Marker, UINT8 *);

-  DataMask    = VA_ARG (Marker, UINT8 *);

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, UINT8 *);

+  DataMask = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSaveMemReadWrite (Width, Address, Data, DataMask);

 }

@@ -137,18 +139,18 @@ BootScriptWriteMemReadWrite (
 **/

 EFI_STATUS

 BootScriptWritePciCfgWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINTN                 Count;

-  UINT8                 *Buffer;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINTN                     Count;

+  UINT8                     *Buffer;

 

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Address     = VA_ARG (Marker, UINT64);

-  Count       = VA_ARG (Marker, UINTN);

-  Buffer      = VA_ARG (Marker, UINT8 *);

+  Width   = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address = VA_ARG (Marker, UINT64);

+  Count   = VA_ARG (Marker, UINTN);

+  Buffer  = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSavePciCfgWrite (Width, Address, Count, Buffer);

 }

@@ -165,21 +167,22 @@ BootScriptWritePciCfgWrite (
 **/

 EFI_STATUS

 BootScriptWritePciCfgReadWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINT8                 *Data;

-  UINT8                 *DataMask;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINT8                     *Data;

+  UINT8                     *DataMask;

 

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Address     = VA_ARG (Marker, UINT64);

-  Data        = VA_ARG (Marker, UINT8 *);

-  DataMask    = VA_ARG (Marker, UINT8 *);

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, UINT8 *);

+  DataMask = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSavePciCfgReadWrite (Width, Address, Data, DataMask);

 }

+

 /**

   Internal function to add PciCfg2 write opcode to the table.

 

@@ -192,20 +195,20 @@ BootScriptWritePciCfgReadWrite (
 **/

 EFI_STATUS

 BootScriptWritePciCfg2Write (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT64                Address;

-  UINTN                 Count;

-  UINT8                 *Buffer;

-  UINT16                Segment;

-

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Segment     = VA_ARG (Marker, UINT16);

-  Address     = VA_ARG (Marker, UINT64);

-  Count       = VA_ARG (Marker, UINTN);

-  Buffer      = VA_ARG (Marker, UINT8 *);

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  UINTN                     Count;

+  UINT8                     *Buffer;

+  UINT16                    Segment;

+

+  Width   = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Segment = VA_ARG (Marker, UINT16);

+  Address = VA_ARG (Marker, UINT64);

+  Count   = VA_ARG (Marker, UINTN);

+  Buffer  = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSavePciCfg2Write (Width, Segment, Address, Count, Buffer);

 }

@@ -222,23 +225,24 @@ BootScriptWritePciCfg2Write (
 **/

 EFI_STATUS

 BootScriptWritePciCfg2ReadWrite (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH Width;

-  UINT16                Segment;

-  UINT64                Address;

-  UINT8                 *Data;

-  UINT8                 *DataMask;

-

-  Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-  Segment     = VA_ARG (Marker, UINT16);

-  Address     = VA_ARG (Marker, UINT64);

-  Data        = VA_ARG (Marker, UINT8 *);

-  DataMask    = VA_ARG (Marker, UINT8 *);

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT16                    Segment;

+  UINT64                    Address;

+  UINT8                     *Data;

+  UINT8                     *DataMask;

+

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Segment  = VA_ARG (Marker, UINT16);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, UINT8 *);

+  DataMask = VA_ARG (Marker, UINT8 *);

 

   return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);

 }

+

 /**

   Internal function to add smbus execute opcode to the table.

 

@@ -251,27 +255,28 @@ BootScriptWritePciCfg2ReadWrite (
 **/

 EFI_STATUS

 BootScriptWriteSmbusExecute (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

   EFI_SMBUS_DEVICE_ADDRESS  SlaveAddress;

   EFI_SMBUS_DEVICE_COMMAND  Command;

   EFI_SMBUS_OPERATION       Operation;

   BOOLEAN                   PecCheck;

-  VOID                     *Buffer;

-  UINTN                    *DataSize;

+  VOID                      *Buffer;

+  UINTN                     *DataSize;

   UINTN                     SmBusAddress;

 

   SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);

   Command                         = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);

   Operation                       = VA_ARG (Marker, EFI_SMBUS_OPERATION);

   PecCheck                        = VA_ARG (Marker, BOOLEAN);

-  SmBusAddress                    = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);

+  SmBusAddress                    = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress, Command, 0, PecCheck);

   DataSize                        = VA_ARG (Marker, UINTN *);

   Buffer                          = VA_ARG (Marker, VOID *);

 

   return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);

 }

+

 /**

   Internal function to add stall opcode to the table.

 

@@ -284,12 +289,12 @@ BootScriptWriteSmbusExecute (
 **/

 EFI_STATUS

 BootScriptWriteStall (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  UINT32                Duration;

+  UINT32  Duration;

 

-  Duration    = VA_ARG (Marker, UINT32);

+  Duration = VA_ARG (Marker, UINT32);

 

   return S3BootScriptSaveStall (Duration);

 }

@@ -307,12 +312,12 @@ BootScriptWriteStall (
 **/

 EFI_STATUS

 BootScriptWriteDispatch (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  VOID        *EntryPoint;

+  VOID  *EntryPoint;

 

-  EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

+  EntryPoint = (VOID *)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

   return S3BootScriptSaveDispatch (EntryPoint);

 }

 

@@ -328,16 +333,16 @@ BootScriptWriteDispatch (
 **/

 EFI_STATUS

 BootScriptWriteMemPoll (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  S3_BOOT_SCRIPT_LIB_WIDTH   Width;

-  UINT64                     Address;

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

   VOID                      *Data;

   VOID                      *DataMask;

-  UINT64                     Delay;

-  UINT64                     LoopTimes;

-  UINT32                     Remainder;

+  UINT64                    Delay;

+  UINT64                    LoopTimes;

+  UINT32                    Remainder;

 

   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

   Address  = VA_ARG (Marker, UINT64);

@@ -360,10 +365,10 @@ BootScriptWriteMemPoll (
     //

     // If Remainder is not zero, LoopTimes will be rounded up by 1.

     //

-    LoopTimes +=1;

+    LoopTimes += 1;

   }

-  return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);

 

+  return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);

 }

 

 /**

@@ -379,17 +384,18 @@ BootScriptWriteMemPoll (
 **/

 EFI_STATUS

 BootScriptWriteDispatch2 (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-  VOID                  *EntryPoint;

-  VOID                  *Context;

+  VOID  *EntryPoint;

+  VOID  *Context;

 

-  EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

-  Context    = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

+  EntryPoint = (VOID *)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

+  Context    = (VOID *)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

 

   return S3BootScriptSaveDispatch2 (EntryPoint, Context);

 }

+

 /**

   Internal function to add INFORAMTION opcode node to the table

   list.

@@ -402,16 +408,17 @@ BootScriptWriteDispatch2 (
 **/

 EFI_STATUS

 BootScriptWriteInformation (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

   UINT32                InformationLength;

   EFI_PHYSICAL_ADDRESS  Information;

 

   InformationLength = VA_ARG (Marker, UINT32);

-  Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

-  return S3BootScriptSaveInformation (InformationLength, (VOID*)(UINTN)Information);

+  Information       = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);

+  return S3BootScriptSaveInformation (InformationLength, (VOID *)(UINTN)Information);

 }

+

 /**

   Internal function to add IO poll opcode node  to the table

   @param  Marker                The variable argument list to get the opcode

@@ -423,23 +430,24 @@ BootScriptWriteInformation (
 **/

 EFI_STATUS

 BootScriptWriteIoPoll (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-   S3_BOOT_SCRIPT_LIB_WIDTH     Width;

-   UINT64                     Address;

-   VOID                      *Data;

-   VOID                      *DataMask;

-   UINT64                     Delay;

-

-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-   Address  = VA_ARG (Marker, UINT64);

-   Data     = VA_ARG (Marker, VOID *);

-   DataMask = VA_ARG (Marker, VOID *);

-   Delay    = (UINT64)VA_ARG (Marker, UINT64);

-

-   return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  VOID                      *Data;

+  VOID                      *DataMask;

+  UINT64                    Delay;

+

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, VOID *);

+  DataMask = VA_ARG (Marker, VOID *);

+  Delay    = (UINT64)VA_ARG (Marker, UINT64);

+

+  return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);

 }

+

 /**

   Internal function to add PCI config poll opcode node to the table

 

@@ -452,24 +460,24 @@ BootScriptWriteIoPoll (
 **/

 EFI_STATUS

 BootScriptWritePciConfigPoll (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-   S3_BOOT_SCRIPT_LIB_WIDTH   Width;

-   UINT64                     Address;

-   VOID                      *Data;

-   VOID                      *DataMask;

-   UINT64                     Delay;

-

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT64                    Address;

+  VOID                      *Data;

+  VOID                      *DataMask;

+  UINT64                    Delay;

 

-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-   Address  = VA_ARG (Marker, UINT64);

-   Data     = VA_ARG (Marker, VOID *);

-   DataMask = VA_ARG (Marker, VOID *);

-   Delay    = (UINT64)VA_ARG (Marker, UINT64);

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, VOID *);

+  DataMask = VA_ARG (Marker, VOID *);

+  Delay    = (UINT64)VA_ARG (Marker, UINT64);

 

-   return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);

+  return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);

 }

+

 /**

   Internal function to add PCI config 2 poll opcode node to the table

 

@@ -482,24 +490,24 @@ BootScriptWritePciConfigPoll (
 **/

 EFI_STATUS

 BootScriptWritePciConfig2Poll (

-  IN VA_LIST                       Marker

+  IN VA_LIST  Marker

   )

 {

-   S3_BOOT_SCRIPT_LIB_WIDTH      Width;

-   UINT16                        Segment;

-   UINT64                        Address;

-   VOID                         *Data;

-   VOID                         *DataMask;

-   UINT64                        Delay;

-

-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

-   Segment  = VA_ARG (Marker, UINT16);

-   Address  = VA_ARG (Marker, UINT64);

-   Data     = VA_ARG (Marker, VOID *);

-   DataMask = VA_ARG (Marker, VOID *);

-   Delay    = (UINT64)VA_ARG (Marker, UINT64);

-

-   return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);

+  S3_BOOT_SCRIPT_LIB_WIDTH  Width;

+  UINT16                    Segment;

+  UINT64                    Address;

+  VOID                      *Data;

+  VOID                      *DataMask;

+  UINT64                    Delay;

+

+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);

+  Segment  = VA_ARG (Marker, UINT16);

+  Address  = VA_ARG (Marker, UINT64);

+  Data     = VA_ARG (Marker, VOID *);

+  DataMask = VA_ARG (Marker, VOID *);

+  Delay    = (UINT64)VA_ARG (Marker, UINT64);

+

+  return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);

 }

 

 /**

@@ -532,128 +540,129 @@ BootScriptWritePciConfig2Poll (
 EFI_STATUS

 EFIAPI

 BootScriptWrite (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL         *This,

-  IN UINTN                                     OpCode,

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL  *This,

+  IN UINTN                             OpCode,

   ...

   )

 {

-  EFI_STATUS                Status;

-  VA_LIST                   Marker;

+  EFI_STATUS  Status;

+  VA_LIST     Marker;

+

   //

   // Build script according to opcode

   //

   switch (OpCode) {

-

-  case EFI_BOOT_SCRIPT_IO_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteIoWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteIoReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteMemWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteMemReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfgWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfgReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_SMBUS_EXECUTE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteSmbusExecute (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_STALL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteStall (Marker);

-    VA_END (Marker);

-

-    break;

-

-  case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteDispatch (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteDispatch2 (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_INFORMATION_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteInformation (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_MEM_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteMemPoll (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfg2Write (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfg2ReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteIoPoll (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciConfigPoll (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciConfig2Poll (Marker);

-    VA_END (Marker);

-    break;

-

-  default:

-    Status = EFI_INVALID_PARAMETER;

-    break;

+    case EFI_BOOT_SCRIPT_IO_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteIoWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteIoReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteMemWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteMemReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfgWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfgReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_SMBUS_EXECUTE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteSmbusExecute (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_STALL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteStall (Marker);

+      VA_END (Marker);

+

+      break;

+

+    case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteDispatch (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteDispatch2 (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_INFORMATION_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteInformation (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_MEM_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteMemPoll (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfg2Write (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfg2ReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteIoPoll (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciConfigPoll (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciConfig2Poll (Marker);

+      VA_END (Marker);

+      break;

+

+    default:

+      Status = EFI_INVALID_PARAMETER;

+      break;

   }

 

   return Status;

 }

+

 /**

   Insert a record into a specified Framework boot script table.

 

@@ -685,133 +694,135 @@ BootScriptWrite (
 EFI_STATUS

 EFIAPI

 BootScriptInsert (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL    *This,

-  IN       BOOLEAN                          BeforeOrAfter,

-  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION     *Position OPTIONAL,

-  IN       UINTN                            OpCode,

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL   *This,

+  IN       BOOLEAN                      BeforeOrAfter,

+  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION  *Position OPTIONAL,

+  IN       UINTN                        OpCode,

   ...

   )

 {

-  EFI_STATUS                Status;

-  VA_LIST                   Marker;

+  EFI_STATUS  Status;

+  VA_LIST     Marker;

+

   //

   // Build script according to opcode

   //

   switch (OpCode) {

-

-  case EFI_BOOT_SCRIPT_IO_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteIoWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteIoReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteMemWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteMemReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfgWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfgReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_SMBUS_EXECUTE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteSmbusExecute (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_STALL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteStall (Marker);

-    VA_END (Marker);

-

-    break;

-

-  case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteDispatch (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteDispatch2 (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_INFORMATION_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteInformation (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_MEM_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteMemPoll (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfg2Write (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciCfg2ReadWrite (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWriteIoPoll (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciConfigPoll (Marker);

-    VA_END (Marker);

-    break;

-

-  case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:

-    VA_START (Marker, OpCode);

-    Status = BootScriptWritePciConfig2Poll (Marker);

-    VA_END (Marker);

-    break;

-

-  default:

-    Status = EFI_INVALID_PARAMETER;

-    break;

+    case EFI_BOOT_SCRIPT_IO_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteIoWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteIoReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteMemWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteMemReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfgWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfgReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_SMBUS_EXECUTE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteSmbusExecute (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_STALL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteStall (Marker);

+      VA_END (Marker);

+

+      break;

+

+    case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteDispatch (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteDispatch2 (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_INFORMATION_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteInformation (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_MEM_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteMemPoll (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfg2Write (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciCfg2ReadWrite (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWriteIoPoll (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciConfigPoll (Marker);

+      VA_END (Marker);

+      break;

+

+    case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:

+      VA_START (Marker, OpCode);

+      Status = BootScriptWritePciConfig2Poll (Marker);

+      VA_END (Marker);

+      break;

+

+    default:

+      Status = EFI_INVALID_PARAMETER;

+      break;

   }

 

   if (!EFI_ERROR (Status)) {

-   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position);

+    Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position);

   }

+

   return Status;

 }

+

 /**

   Find a label within the boot script table and, if not present, optionally create it.

 

@@ -842,15 +853,16 @@ BootScriptInsert (
 EFI_STATUS

 EFIAPI

 BootScriptLabel (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL           *This,

-  IN       BOOLEAN                               BeforeOrAfter,

-  IN       BOOLEAN                               CreateIfNotFound,

-  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION          *Position OPTIONAL,

-  IN CONST CHAR8                                *Label

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL   *This,

+  IN       BOOLEAN                      BeforeOrAfter,

+  IN       BOOLEAN                      CreateIfNotFound,

+  IN OUT   EFI_S3_BOOT_SCRIPT_POSITION  *Position OPTIONAL,

+  IN CONST CHAR8                        *Label

   )

 {

   return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Position, Label);

 }

+

 /**

   Compare two positions in the boot script table and return their relative position.

 

@@ -871,14 +883,15 @@ BootScriptLabel (
 EFI_STATUS

 EFIAPI

 BootScriptCompare (

-  IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,

-  IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,

-  IN       EFI_S3_BOOT_SCRIPT_POSITION      Position2,

-  OUT      UINTN                           *RelativePosition

+  IN CONST EFI_S3_SAVE_STATE_PROTOCOL   *This,

+  IN       EFI_S3_BOOT_SCRIPT_POSITION  Position1,

+  IN       EFI_S3_BOOT_SCRIPT_POSITION  Position2,

+  OUT      UINTN                        *RelativePosition

   )

 {

   return S3BootScriptCompare (Position1, Position2, RelativePosition);

 }

+

 /**

   This routine is entry point of ScriptSave driver.

 

@@ -893,21 +906,21 @@ BootScriptCompare (
 EFI_STATUS

 EFIAPI

 InitializeSmmS3SaveState (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_HANDLE   Handle;

+  EFI_HANDLE  Handle;

 

   if (!PcdGetBool (PcdAcpiS3Enable)) {

     return EFI_UNSUPPORTED;

   }

 

-  Handle  = NULL;

-  return  gSmst->SmmInstallProtocolInterface (

-                   &Handle,

-                   &gEfiS3SmmSaveStateProtocolGuid,

-                   EFI_NATIVE_INTERFACE,

-                   &mS3SmmSaveState

-                   );

+  Handle = NULL;

+  return gSmst->SmmInstallProtocolInterface (

+                  &Handle,

+                  &gEfiS3SmmSaveStateProtocolGuid,

+                  EFI_NATIVE_INTERFACE,

+                  &mS3SmmSaveState

+                  );

 }