MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Library / BaseS3IoLib / S3IoLib.c

diff --git a/MdePkg/Library/BaseS3IoLib/S3IoLib.c b/MdePkg/Library/BaseS3IoLib/S3IoLib.c
index c68a43329b0633a6af04effe4e397d5bb4b86fd1..15258263868352570ede9e70fe912b5395ae077c 100644 (file)
--- a/MdePkg/Library/BaseS3IoLib/S3IoLib.c
+++ b/MdePkg/Library/BaseS3IoLib/S3IoLib.c
@@ -15,7 +15,6 @@
 #include <Library/IoLib.h>\r
 #include <Library/S3BootScriptLib.h>\r
 \r
-\r
 /**\r
   Saves an I/O port value to the boot script.\r
 \r
@@ -32,11 +31,11 @@
 VOID\r
 InternalSaveIoWriteValueToBootScript (\r
   IN S3_BOOT_SCRIPT_LIB_WIDTH  Width,\r
-  IN UINTN                  Port,\r
-  IN VOID                   *Buffer\r
+  IN UINTN                     Port,\r
+  IN VOID                      *Buffer\r
   )\r
 {\r
-  RETURN_STATUS                Status;\r
+  RETURN_STATUS  Status;\r
 \r
   Status = S3BootScriptSaveIoWrite (\r
              Width,\r
@@ -63,8 +62,8 @@ InternalSaveIoWriteValueToBootScript (
 **/\r
 UINT8\r
 InternalSaveIoWrite8ValueToBootScript (\r
-  IN UINTN              Port,\r
-  IN UINT8              Value\r
+  IN UINTN  Port,\r
+  IN UINT8  Value\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint8, Port, &Value);\r
@@ -90,7 +89,7 @@ InternalSaveIoWrite8ValueToBootScript (
 UINT8\r
 EFIAPI\r
 S3IoRead8 (\r
-  IN UINTN              Port\r
+  IN UINTN  Port\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoRead8 (Port));\r
@@ -115,8 +114,8 @@ S3IoRead8 (
 UINT8\r
 EFIAPI\r
 S3IoWrite8 (\r
-  IN UINTN              Port,\r
-  IN UINT8              Value\r
+  IN UINTN  Port,\r
+  IN UINT8  Value\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoWrite8 (Port, Value));\r
@@ -144,8 +143,8 @@ S3IoWrite8 (
 UINT8\r
 EFIAPI\r
 S3IoOr8 (\r
-  IN UINTN              Port,\r
-  IN UINT8              OrData\r
+  IN UINTN  Port,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoOr8 (Port, OrData));\r
@@ -173,8 +172,8 @@ S3IoOr8 (
 UINT8\r
 EFIAPI\r
 S3IoAnd8 (\r
-  IN UINTN              Port,\r
-  IN UINT8              AndData\r
+  IN UINTN  Port,\r
+  IN UINT8  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoAnd8 (Port, AndData));\r
@@ -204,9 +203,9 @@ S3IoAnd8 (
 UINT8\r
 EFIAPI\r
 S3IoAndThenOr8 (\r
-  IN UINTN              Port,\r
-  IN UINT8              AndData,\r
-  IN UINT8              OrData\r
+  IN UINTN  Port,\r
+  IN UINT8  AndData,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoAndThenOr8 (Port, AndData, OrData));\r
@@ -236,9 +235,9 @@ S3IoAndThenOr8 (
 UINT8\r
 EFIAPI\r
 S3IoBitFieldRead8 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoBitFieldRead8 (Port, StartBit, EndBit));\r
@@ -272,10 +271,10 @@ S3IoBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 S3IoBitFieldWrite8 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              Value\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  Value\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoBitFieldWrite8 (Port, StartBit, EndBit, Value));\r
@@ -311,10 +310,10 @@ S3IoBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 S3IoBitFieldOr8 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              OrData\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoBitFieldOr8 (Port, StartBit, EndBit, OrData));\r
@@ -350,10 +349,10 @@ S3IoBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 S3IoBitFieldAnd8 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              AndData\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoBitFieldAnd8 (Port, StartBit, EndBit, AndData));\r
@@ -392,11 +391,11 @@ S3IoBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 S3IoBitFieldAndThenOr8 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              AndData,\r
-  IN UINT8              OrData\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  AndData,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite8ValueToBootScript (Port, IoBitFieldAndThenOr8 (Port, StartBit, EndBit, AndData, OrData));\r
@@ -418,8 +417,8 @@ S3IoBitFieldAndThenOr8 (
 **/\r
 UINT16\r
 InternalSaveIoWrite16ValueToBootScript (\r
-  IN UINTN              Port,\r
-  IN UINT16             Value\r
+  IN UINTN   Port,\r
+  IN UINT16  Value\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint16, Port, &Value);\r
@@ -445,7 +444,7 @@ InternalSaveIoWrite16ValueToBootScript (
 UINT16\r
 EFIAPI\r
 S3IoRead16 (\r
-  IN UINTN              Port\r
+  IN UINTN  Port\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoRead16 (Port));\r
@@ -470,8 +469,8 @@ S3IoRead16 (
 UINT16\r
 EFIAPI\r
 S3IoWrite16 (\r
-  IN UINTN              Port,\r
-  IN UINT16             Value\r
+  IN UINTN   Port,\r
+  IN UINT16  Value\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoWrite16 (Port, Value));\r
@@ -499,8 +498,8 @@ S3IoWrite16 (
 UINT16\r
 EFIAPI\r
 S3IoOr16 (\r
-  IN UINTN              Port,\r
-  IN UINT16             OrData\r
+  IN UINTN   Port,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoOr16 (Port, OrData));\r
@@ -528,8 +527,8 @@ S3IoOr16 (
 UINT16\r
 EFIAPI\r
 S3IoAnd16 (\r
-  IN UINTN              Port,\r
-  IN UINT16             AndData\r
+  IN UINTN   Port,\r
+  IN UINT16  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoAnd16 (Port, AndData));\r
@@ -559,9 +558,9 @@ S3IoAnd16 (
 UINT16\r
 EFIAPI\r
 S3IoAndThenOr16 (\r
-  IN UINTN              Port,\r
-  IN UINT16             AndData,\r
-  IN UINT16             OrData\r
+  IN UINTN   Port,\r
+  IN UINT16  AndData,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoAndThenOr16 (Port, AndData, OrData));\r
@@ -591,9 +590,9 @@ S3IoAndThenOr16 (
 UINT16\r
 EFIAPI\r
 S3IoBitFieldRead16 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoBitFieldRead16 (Port, StartBit, EndBit));\r
@@ -627,10 +626,10 @@ S3IoBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 S3IoBitFieldWrite16 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             Value\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  Value\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoBitFieldWrite16 (Port, StartBit, EndBit, Value));\r
@@ -666,10 +665,10 @@ S3IoBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 S3IoBitFieldOr16 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             OrData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoBitFieldOr16 (Port, StartBit, EndBit, OrData));\r
@@ -705,10 +704,10 @@ S3IoBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 S3IoBitFieldAnd16 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             AndData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoBitFieldAnd16 (Port, StartBit, EndBit, AndData));\r
@@ -748,11 +747,11 @@ S3IoBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 S3IoBitFieldAndThenOr16 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             AndData,\r
-  IN UINT16             OrData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  AndData,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite16ValueToBootScript (Port, IoBitFieldAndThenOr16 (Port, StartBit, EndBit, AndData, OrData));\r
@@ -774,8 +773,8 @@ S3IoBitFieldAndThenOr16 (
 **/\r
 UINT32\r
 InternalSaveIoWrite32ValueToBootScript (\r
-  IN UINTN              Port,\r
-  IN UINT32             Value\r
+  IN UINTN   Port,\r
+  IN UINT32  Value\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint32, Port, &Value);\r
@@ -801,7 +800,7 @@ InternalSaveIoWrite32ValueToBootScript (
 UINT32\r
 EFIAPI\r
 S3IoRead32 (\r
-  IN UINTN              Port\r
+  IN UINTN  Port\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoRead32 (Port));\r
@@ -826,8 +825,8 @@ S3IoRead32 (
 UINT32\r
 EFIAPI\r
 S3IoWrite32 (\r
-  IN UINTN              Port,\r
-  IN UINT32             Value\r
+  IN UINTN   Port,\r
+  IN UINT32  Value\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoWrite32 (Port, Value));\r
@@ -855,8 +854,8 @@ S3IoWrite32 (
 UINT32\r
 EFIAPI\r
 S3IoOr32 (\r
-  IN UINTN              Port,\r
-  IN UINT32             OrData\r
+  IN UINTN   Port,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoOr32 (Port, OrData));\r
@@ -884,8 +883,8 @@ S3IoOr32 (
 UINT32\r
 EFIAPI\r
 S3IoAnd32 (\r
-  IN UINTN              Port,\r
-  IN UINT32             AndData\r
+  IN UINTN   Port,\r
+  IN UINT32  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoAnd32 (Port, AndData));\r
@@ -915,9 +914,9 @@ S3IoAnd32 (
 UINT32\r
 EFIAPI\r
 S3IoAndThenOr32 (\r
-  IN UINTN              Port,\r
-  IN UINT32             AndData,\r
-  IN UINT32             OrData\r
+  IN UINTN   Port,\r
+  IN UINT32  AndData,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoAndThenOr32 (Port, AndData, OrData));\r
@@ -947,9 +946,9 @@ S3IoAndThenOr32 (
 UINT32\r
 EFIAPI\r
 S3IoBitFieldRead32 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoBitFieldRead32 (Port, StartBit, EndBit));\r
@@ -983,10 +982,10 @@ S3IoBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 S3IoBitFieldWrite32 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             Value\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  Value\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoBitFieldWrite32 (Port, StartBit, EndBit, Value));\r
@@ -1022,10 +1021,10 @@ S3IoBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 S3IoBitFieldOr32 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             OrData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoBitFieldOr32 (Port, StartBit, EndBit, OrData));\r
@@ -1061,10 +1060,10 @@ S3IoBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 S3IoBitFieldAnd32 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             AndData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoBitFieldAnd32 (Port, StartBit, EndBit, AndData));\r
@@ -1104,11 +1103,11 @@ S3IoBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 S3IoBitFieldAndThenOr32 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             AndData,\r
-  IN UINT32             OrData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  AndData,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite32ValueToBootScript (Port, IoBitFieldAndThenOr32 (Port, StartBit, EndBit, AndData, OrData));\r
@@ -1130,8 +1129,8 @@ S3IoBitFieldAndThenOr32 (
 **/\r
 UINT64\r
 InternalSaveIoWrite64ValueToBootScript (\r
-  IN UINTN              Port,\r
-  IN UINT64             Value\r
+  IN UINTN   Port,\r
+  IN UINT64  Value\r
   )\r
 {\r
   InternalSaveIoWriteValueToBootScript (S3BootScriptWidthUint64, Port, &Value);\r
@@ -1157,7 +1156,7 @@ InternalSaveIoWrite64ValueToBootScript (
 UINT64\r
 EFIAPI\r
 S3IoRead64 (\r
-  IN UINTN              Port\r
+  IN UINTN  Port\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoRead64 (Port));\r
@@ -1182,8 +1181,8 @@ S3IoRead64 (
 UINT64\r
 EFIAPI\r
 S3IoWrite64 (\r
-  IN UINTN              Port,\r
-  IN UINT64             Value\r
+  IN UINTN   Port,\r
+  IN UINT64  Value\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoWrite64 (Port, Value));\r
@@ -1211,8 +1210,8 @@ S3IoWrite64 (
 UINT64\r
 EFIAPI\r
 S3IoOr64 (\r
-  IN UINTN              Port,\r
-  IN UINT64             OrData\r
+  IN UINTN   Port,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoOr64 (Port, OrData));\r
@@ -1240,8 +1239,8 @@ S3IoOr64 (
 UINT64\r
 EFIAPI\r
 S3IoAnd64 (\r
-  IN UINTN              Port,\r
-  IN UINT64             AndData\r
+  IN UINTN   Port,\r
+  IN UINT64  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoAnd64 (Port, AndData));\r
@@ -1271,9 +1270,9 @@ S3IoAnd64 (
 UINT64\r
 EFIAPI\r
 S3IoAndThenOr64 (\r
-  IN UINTN              Port,\r
-  IN UINT64             AndData,\r
-  IN UINT64             OrData\r
+  IN UINTN   Port,\r
+  IN UINT64  AndData,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoAndThenOr64 (Port, AndData, OrData));\r
@@ -1303,9 +1302,9 @@ S3IoAndThenOr64 (
 UINT64\r
 EFIAPI\r
 S3IoBitFieldRead64 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Port,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoBitFieldRead64 (Port, StartBit, EndBit));\r
@@ -1339,10 +1338,10 @@ S3IoBitFieldRead64 (
 UINT64\r
 EFIAPI\r
 S3IoBitFieldWrite64 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             Value\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  Value\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoBitFieldWrite64 (Port, StartBit, EndBit, Value));\r
@@ -1378,10 +1377,10 @@ S3IoBitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 S3IoBitFieldOr64 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             OrData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoBitFieldOr64 (Port, StartBit, EndBit, OrData));\r
@@ -1417,10 +1416,10 @@ S3IoBitFieldOr64 (
 UINT64\r
 EFIAPI\r
 S3IoBitFieldAnd64 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             AndData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  AndData\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoBitFieldAnd64 (Port, StartBit, EndBit, AndData));\r
@@ -1460,11 +1459,11 @@ S3IoBitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 S3IoBitFieldAndThenOr64 (\r
-  IN UINTN              Port,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             AndData,\r
-  IN UINT64             OrData\r
+  IN UINTN   Port,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  AndData,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveIoWrite64ValueToBootScript (Port, IoBitFieldAndThenOr64 (Port, StartBit, EndBit, AndData, OrData));\r
@@ -1486,11 +1485,11 @@ S3IoBitFieldAndThenOr64 (
 VOID\r
 InternalSaveMmioWriteValueToBootScript (\r
   IN S3_BOOT_SCRIPT_LIB_WIDTH  Width,\r
-  IN UINTN                  Address,\r
-  IN VOID                   *Buffer\r
+  IN UINTN                     Address,\r
+  IN VOID                      *Buffer\r
   )\r
 {\r
-  RETURN_STATUS            Status;\r
+  RETURN_STATUS  Status;\r
 \r
   Status = S3BootScriptSaveMemWrite (\r
              Width,\r
@@ -1517,8 +1516,8 @@ InternalSaveMmioWriteValueToBootScript (
 **/\r
 UINT8\r
 InternalSaveMmioWrite8ValueToBootScript (\r
-  IN UINTN              Address,\r
-  IN UINT8              Value\r
+  IN UINTN  Address,\r
+  IN UINT8  Value\r
   )\r
 {\r
   InternalSaveMmioWriteValueToBootScript (S3BootScriptWidthUint8, Address, &Value);\r
@@ -1544,7 +1543,7 @@ InternalSaveMmioWrite8ValueToBootScript (
 UINT8\r
 EFIAPI\r
 S3MmioRead8 (\r
-  IN UINTN              Address\r
+  IN UINTN  Address\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioRead8 (Address));\r
@@ -1569,8 +1568,8 @@ S3MmioRead8 (
 UINT8\r
 EFIAPI\r
 S3MmioWrite8 (\r
-  IN UINTN              Address,\r
-  IN UINT8              Value\r
+  IN UINTN  Address,\r
+  IN UINT8  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioWrite8 (Address, Value));\r
@@ -1598,8 +1597,8 @@ S3MmioWrite8 (
 UINT8\r
 EFIAPI\r
 S3MmioOr8 (\r
-  IN UINTN              Address,\r
-  IN UINT8              OrData\r
+  IN UINTN  Address,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioOr8 (Address, OrData));\r
@@ -1627,8 +1626,8 @@ S3MmioOr8 (
 UINT8\r
 EFIAPI\r
 S3MmioAnd8 (\r
-  IN UINTN              Address,\r
-  IN UINT8              AndData\r
+  IN UINTN  Address,\r
+  IN UINT8  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioAnd8 (Address, AndData));\r
@@ -1658,9 +1657,9 @@ S3MmioAnd8 (
 UINT8\r
 EFIAPI\r
 S3MmioAndThenOr8 (\r
-  IN UINTN              Address,\r
-  IN UINT8              AndData,\r
-  IN UINT8              OrData\r
+  IN UINTN  Address,\r
+  IN UINT8  AndData,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioAndThenOr8 (Address, AndData, OrData));\r
@@ -1690,9 +1689,9 @@ S3MmioAndThenOr8 (
 UINT8\r
 EFIAPI\r
 S3MmioBitFieldRead8 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioBitFieldRead8 (Address, StartBit, EndBit));\r
@@ -1725,10 +1724,10 @@ S3MmioBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 S3MmioBitFieldWrite8 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              Value\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioBitFieldWrite8 (Address, StartBit, EndBit, Value));\r
@@ -1765,10 +1764,10 @@ S3MmioBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 S3MmioBitFieldOr8 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              OrData\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioBitFieldOr8 (Address, StartBit, EndBit, OrData));\r
@@ -1805,10 +1804,10 @@ S3MmioBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 S3MmioBitFieldAnd8 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              AndData\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioBitFieldAnd8 (Address, StartBit, EndBit, AndData));\r
@@ -1848,11 +1847,11 @@ S3MmioBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 S3MmioBitFieldAndThenOr8 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT8              AndData,\r
-  IN UINT8              OrData\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit,\r
+  IN UINT8  AndData,\r
+  IN UINT8  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite8ValueToBootScript (Address, MmioBitFieldAndThenOr8 (Address, StartBit, EndBit, AndData, OrData));\r
@@ -1874,8 +1873,8 @@ S3MmioBitFieldAndThenOr8 (
 **/\r
 UINT16\r
 InternalSaveMmioWrite16ValueToBootScript (\r
-  IN UINTN              Address,\r
-  IN UINT16             Value\r
+  IN UINTN   Address,\r
+  IN UINT16  Value\r
   )\r
 {\r
   InternalSaveMmioWriteValueToBootScript (S3BootScriptWidthUint16, Address, &Value);\r
@@ -1901,7 +1900,7 @@ InternalSaveMmioWrite16ValueToBootScript (
 UINT16\r
 EFIAPI\r
 S3MmioRead16 (\r
-  IN UINTN              Address\r
+  IN UINTN  Address\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioRead16 (Address));\r
@@ -1927,8 +1926,8 @@ S3MmioRead16 (
 UINT16\r
 EFIAPI\r
 S3MmioWrite16 (\r
-  IN UINTN              Address,\r
-  IN UINT16             Value\r
+  IN UINTN   Address,\r
+  IN UINT16  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioWrite16 (Address, Value));\r
@@ -1956,8 +1955,8 @@ S3MmioWrite16 (
 UINT16\r
 EFIAPI\r
 S3MmioOr16 (\r
-  IN UINTN              Address,\r
-  IN UINT16             OrData\r
+  IN UINTN   Address,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioOr16 (Address, OrData));\r
@@ -1985,8 +1984,8 @@ S3MmioOr16 (
 UINT16\r
 EFIAPI\r
 S3MmioAnd16 (\r
-  IN UINTN              Address,\r
-  IN UINT16             AndData\r
+  IN UINTN   Address,\r
+  IN UINT16  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioAnd16 (Address, AndData));\r
@@ -2016,9 +2015,9 @@ S3MmioAnd16 (
 UINT16\r
 EFIAPI\r
 S3MmioAndThenOr16 (\r
-  IN UINTN              Address,\r
-  IN UINT16             AndData,\r
-  IN UINT16             OrData\r
+  IN UINTN   Address,\r
+  IN UINT16  AndData,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioAndThenOr16 (Address, AndData, OrData));\r
@@ -2048,9 +2047,9 @@ S3MmioAndThenOr16 (
 UINT16\r
 EFIAPI\r
 S3MmioBitFieldRead16 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioBitFieldRead16 (Address, StartBit, EndBit));\r
@@ -2083,10 +2082,10 @@ S3MmioBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 S3MmioBitFieldWrite16 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             Value\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioBitFieldWrite16 (Address, StartBit, EndBit, Value));\r
@@ -2123,10 +2122,10 @@ S3MmioBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 S3MmioBitFieldOr16 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             OrData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioBitFieldOr16 (Address, StartBit, EndBit, OrData));\r
@@ -2163,10 +2162,10 @@ S3MmioBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 S3MmioBitFieldAnd16 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             AndData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioBitFieldAnd16 (Address, StartBit, EndBit, AndData));\r
@@ -2206,11 +2205,11 @@ S3MmioBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 S3MmioBitFieldAndThenOr16 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT16             AndData,\r
-  IN UINT16             OrData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT16  AndData,\r
+  IN UINT16  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite16ValueToBootScript (Address, MmioBitFieldAndThenOr16 (Address, StartBit, EndBit, AndData, OrData));\r
@@ -2232,8 +2231,8 @@ S3MmioBitFieldAndThenOr16 (
 **/\r
 UINT32\r
 InternalSaveMmioWrite32ValueToBootScript (\r
-  IN UINTN              Address,\r
-  IN UINT32             Value\r
+  IN UINTN   Address,\r
+  IN UINT32  Value\r
   )\r
 {\r
   InternalSaveMmioWriteValueToBootScript (S3BootScriptWidthUint32, Address, &Value);\r
@@ -2259,7 +2258,7 @@ InternalSaveMmioWrite32ValueToBootScript (
 UINT32\r
 EFIAPI\r
 S3MmioRead32 (\r
-  IN UINTN              Address\r
+  IN UINTN  Address\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioRead32 (Address));\r
@@ -2284,8 +2283,8 @@ S3MmioRead32 (
 UINT32\r
 EFIAPI\r
 S3MmioWrite32 (\r
-  IN UINTN              Address,\r
-  IN UINT32             Value\r
+  IN UINTN   Address,\r
+  IN UINT32  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioWrite32 (Address, Value));\r
@@ -2313,8 +2312,8 @@ S3MmioWrite32 (
 UINT32\r
 EFIAPI\r
 S3MmioOr32 (\r
-  IN UINTN              Address,\r
-  IN UINT32             OrData\r
+  IN UINTN   Address,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioOr32 (Address, OrData));\r
@@ -2342,8 +2341,8 @@ S3MmioOr32 (
 UINT32\r
 EFIAPI\r
 S3MmioAnd32 (\r
-  IN UINTN              Address,\r
-  IN UINT32             AndData\r
+  IN UINTN   Address,\r
+  IN UINT32  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioAnd32 (Address, AndData));\r
@@ -2373,9 +2372,9 @@ S3MmioAnd32 (
 UINT32\r
 EFIAPI\r
 S3MmioAndThenOr32 (\r
-  IN UINTN              Address,\r
-  IN UINT32             AndData,\r
-  IN UINT32             OrData\r
+  IN UINTN   Address,\r
+  IN UINT32  AndData,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioAndThenOr32 (Address, AndData, OrData));\r
@@ -2405,9 +2404,9 @@ S3MmioAndThenOr32 (
 UINT32\r
 EFIAPI\r
 S3MmioBitFieldRead32 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioBitFieldRead32 (Address, StartBit, EndBit));\r
@@ -2440,10 +2439,10 @@ S3MmioBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 S3MmioBitFieldWrite32 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             Value\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioBitFieldWrite32 (Address, StartBit, EndBit, Value));\r
@@ -2480,10 +2479,10 @@ S3MmioBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 S3MmioBitFieldOr32 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             OrData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioBitFieldOr32 (Address, StartBit, EndBit, OrData));\r
@@ -2520,10 +2519,10 @@ S3MmioBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 S3MmioBitFieldAnd32 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             AndData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioBitFieldAnd32 (Address, StartBit, EndBit, AndData));\r
@@ -2563,11 +2562,11 @@ S3MmioBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 S3MmioBitFieldAndThenOr32 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT32             AndData,\r
-  IN UINT32             OrData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT32  AndData,\r
+  IN UINT32  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite32ValueToBootScript (Address, MmioBitFieldAndThenOr32 (Address, StartBit, EndBit, AndData, OrData));\r
@@ -2589,8 +2588,8 @@ S3MmioBitFieldAndThenOr32 (
 **/\r
 UINT64\r
 InternalSaveMmioWrite64ValueToBootScript (\r
-  IN UINTN              Address,\r
-  IN UINT64             Value\r
+  IN UINTN   Address,\r
+  IN UINT64  Value\r
   )\r
 {\r
   InternalSaveMmioWriteValueToBootScript (S3BootScriptWidthUint64, Address, &Value);\r
@@ -2616,7 +2615,7 @@ InternalSaveMmioWrite64ValueToBootScript (
 UINT64\r
 EFIAPI\r
 S3MmioRead64 (\r
-  IN UINTN              Address\r
+  IN UINTN  Address\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioRead64 (Address));\r
@@ -2641,8 +2640,8 @@ S3MmioRead64 (
 UINT64\r
 EFIAPI\r
 S3MmioWrite64 (\r
-  IN UINTN              Address,\r
-  IN UINT64             Value\r
+  IN UINTN   Address,\r
+  IN UINT64  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioWrite64 (Address, Value));\r
@@ -2670,8 +2669,8 @@ S3MmioWrite64 (
 UINT64\r
 EFIAPI\r
 S3MmioOr64 (\r
-  IN UINTN              Address,\r
-  IN UINT64             OrData\r
+  IN UINTN   Address,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioOr64 (Address, OrData));\r
@@ -2699,8 +2698,8 @@ S3MmioOr64 (
 UINT64\r
 EFIAPI\r
 S3MmioAnd64 (\r
-  IN UINTN              Address,\r
-  IN UINT64             AndData\r
+  IN UINTN   Address,\r
+  IN UINT64  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioAnd64 (Address, AndData));\r
@@ -2730,9 +2729,9 @@ S3MmioAnd64 (
 UINT64\r
 EFIAPI\r
 S3MmioAndThenOr64 (\r
-  IN UINTN              Address,\r
-  IN UINT64             AndData,\r
-  IN UINT64             OrData\r
+  IN UINTN   Address,\r
+  IN UINT64  AndData,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioAndThenOr64 (Address, AndData, OrData));\r
@@ -2762,9 +2761,9 @@ S3MmioAndThenOr64 (
 UINT64\r
 EFIAPI\r
 S3MmioBitFieldRead64 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit\r
+  IN UINTN  Address,\r
+  IN UINTN  StartBit,\r
+  IN UINTN  EndBit\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioBitFieldRead64 (Address, StartBit, EndBit));\r
@@ -2797,10 +2796,10 @@ S3MmioBitFieldRead64 (
 UINT64\r
 EFIAPI\r
 S3MmioBitFieldWrite64 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             Value\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  Value\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioBitFieldWrite64 (Address, StartBit, EndBit, Value));\r
@@ -2837,10 +2836,10 @@ S3MmioBitFieldWrite64 (
 UINT64\r
 EFIAPI\r
 S3MmioBitFieldOr64 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             OrData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioBitFieldOr64 (Address, StartBit, EndBit, OrData));\r
@@ -2877,10 +2876,10 @@ S3MmioBitFieldOr64 (
 UINT64\r
 EFIAPI\r
 S3MmioBitFieldAnd64 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             AndData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  AndData\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioBitFieldAnd64 (Address, StartBit, EndBit, AndData));\r
@@ -2920,11 +2919,11 @@ S3MmioBitFieldAnd64 (
 UINT64\r
 EFIAPI\r
 S3MmioBitFieldAndThenOr64 (\r
-  IN UINTN              Address,\r
-  IN UINTN              StartBit,\r
-  IN UINTN              EndBit,\r
-  IN UINT64             AndData,\r
-  IN UINT64             OrData\r
+  IN UINTN   Address,\r
+  IN UINTN   StartBit,\r
+  IN UINTN   EndBit,\r
+  IN UINT64  AndData,\r
+  IN UINT64  OrData\r
   )\r
 {\r
   return InternalSaveMmioWrite64ValueToBootScript (Address, MmioBitFieldAndThenOr64 (Address, StartBit, EndBit, AndData, OrData));\r
@@ -2952,12 +2951,12 @@ S3MmioBitFieldAndThenOr64 (
 UINT8 *\r
 EFIAPI\r
 S3MmioReadBuffer8 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT8       *Buffer\r
+  IN  UINTN  StartAddress,\r
+  IN  UINTN  Length,\r
+  OUT UINT8  *Buffer\r
   )\r
 {\r
-  UINT8       *ReturnBuffer;\r
+  UINT8          *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioReadBuffer8 (StartAddress, Length, Buffer);\r
@@ -2999,13 +2998,13 @@ S3MmioReadBuffer8 (
 UINT16 *\r
 EFIAPI\r
 S3MmioReadBuffer16 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT16      *Buffer\r
+  IN  UINTN   StartAddress,\r
+  IN  UINTN   Length,\r
+  OUT UINT16  *Buffer\r
   )\r
 {\r
-  UINT16       *ReturnBuffer;\r
-  RETURN_STATUS   Status;\r
+  UINT16         *ReturnBuffer;\r
+  RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioReadBuffer16 (StartAddress, Length, Buffer);\r
 \r
@@ -3046,12 +3045,12 @@ S3MmioReadBuffer16 (
 UINT32 *\r
 EFIAPI\r
 S3MmioReadBuffer32 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT32      *Buffer\r
+  IN  UINTN   StartAddress,\r
+  IN  UINTN   Length,\r
+  OUT UINT32  *Buffer\r
   )\r
 {\r
-  UINT32      *ReturnBuffer;\r
+  UINT32         *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioReadBuffer32 (StartAddress, Length, Buffer);\r
@@ -3093,12 +3092,12 @@ S3MmioReadBuffer32 (
 UINT64 *\r
 EFIAPI\r
 S3MmioReadBuffer64 (\r
-  IN  UINTN       StartAddress,\r
-  IN  UINTN       Length,\r
-  OUT UINT64      *Buffer\r
+  IN  UINTN   StartAddress,\r
+  IN  UINTN   Length,\r
+  OUT UINT64  *Buffer\r
   )\r
 {\r
-  UINT64      *ReturnBuffer;\r
+  UINT64         *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioReadBuffer64 (StartAddress, Length, Buffer);\r
@@ -3114,7 +3113,6 @@ S3MmioReadBuffer64 (
   return ReturnBuffer;\r
 }\r
 \r
-\r
 /**\r
   Copy data from system memory to MMIO region by using 8-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
@@ -3137,12 +3135,12 @@ S3MmioReadBuffer64 (
 UINT8 *\r
 EFIAPI\r
 S3MmioWriteBuffer8 (\r
-  IN  UINTN         StartAddress,\r
-  IN  UINTN         Length,\r
-  IN  CONST UINT8   *Buffer\r
+  IN  UINTN        StartAddress,\r
+  IN  UINTN        Length,\r
+  IN  CONST UINT8  *Buffer\r
   )\r
 {\r
-  UINT8       *ReturnBuffer;\r
+  UINT8          *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioWriteBuffer8 (StartAddress, Length, Buffer);\r
@@ -3185,12 +3183,12 @@ S3MmioWriteBuffer8 (
 UINT16 *\r
 EFIAPI\r
 S3MmioWriteBuffer16 (\r
-  IN  UINTN        StartAddress,\r
-  IN  UINTN        Length,\r
-  IN  CONST UINT16 *Buffer\r
+  IN  UINTN         StartAddress,\r
+  IN  UINTN         Length,\r
+  IN  CONST UINT16  *Buffer\r
   )\r
 {\r
-  UINT16      *ReturnBuffer;\r
+  UINT16         *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioWriteBuffer16 (StartAddress, Length, Buffer);\r
@@ -3206,7 +3204,6 @@ S3MmioWriteBuffer16 (
   return ReturnBuffer;\r
 }\r
 \r
-\r
 /**\r
   Copy data from system memory to MMIO region by using 32-bit access\r
   and saves the value in the S3 script to be replayed on S3 resume.\r
@@ -3234,12 +3231,12 @@ S3MmioWriteBuffer16 (
 UINT32 *\r
 EFIAPI\r
 S3MmioWriteBuffer32 (\r
-  IN  UINTN        StartAddress,\r
-  IN  UINTN        Length,\r
-  IN  CONST UINT32 *Buffer\r
+  IN  UINTN         StartAddress,\r
+  IN  UINTN         Length,\r
+  IN  CONST UINT32  *Buffer\r
   )\r
 {\r
-  UINT32      *ReturnBuffer;\r
+  UINT32         *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioWriteBuffer32 (StartAddress, Length, Buffer);\r
@@ -3282,12 +3279,12 @@ S3MmioWriteBuffer32 (
 UINT64 *\r
 EFIAPI\r
 S3MmioWriteBuffer64 (\r
-  IN  UINTN        StartAddress,\r
-  IN  UINTN        Length,\r
-  IN  CONST UINT64 *Buffer\r
+  IN  UINTN         StartAddress,\r
+  IN  UINTN         Length,\r
+  IN  CONST UINT64  *Buffer\r
   )\r
 {\r
-  UINT64      *ReturnBuffer;\r
+  UINT64         *ReturnBuffer;\r
   RETURN_STATUS  Status;\r
 \r
   ReturnBuffer = MmioWriteBuffer64 (StartAddress, Length, Buffer);\r
@@ -3302,4 +3299,3 @@ S3MmioWriteBuffer64 (
 \r
   return ReturnBuffer;\r
 }\r
-\r